diff --git a/Spring.build b/Spring.build
index b918fda6..62c98d9a 100644
--- a/Spring.build
+++ b/Spring.build
@@ -20,8 +20,10 @@ Build properties that may be set:
 =================================
 "project.build.sign":
         signs all assemblies. Requires the key file $/Spring.Net.snk to be in place
-"package.version:":
+"package.version":
         set the package version
+"build-testing-mstest":
+        set to true if local machine has VS.NET 2008 MSTest installed
 -->
 
   <!-- global project settings -->
@@ -378,6 +380,7 @@ Build properties that may be set:
     <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 and not net-3.0}"/>
     <nant buildfile="src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build" target="build" if="${build-testing-mstest  and (nant.settings.currentframework == 'net-2.0') and not net-3.0}"/>
+    <nant buildfile="src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.build" target="build" if="${build-nms and not net-3.0}"/>
     <nant buildfile="src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build" target="build" if="${build-nms and not net-3.0}"/>
     <nant buildfile="src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.build" target="build" if="${build-quartz and not net-3.0}"/>
     <nant buildfile="src/Spring/Spring.Messaging/Spring.Messaging.build" target="build" if="${build-msmq and not net-3.0}"/>
@@ -406,6 +409,9 @@ Build properties that may be set:
     <nant buildfile="test/Spring/Spring.Web.Tests/Spring.Web.Tests.build" target="test" if="${build-web and not net-3.0}"/>
     <nant buildfile="test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build" target="test" if="${not net-3.0}"/>
     <nant buildfile="test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build" target="test" if="${build-testing-mstest  and (nant.settings.currentframework == 'net-2.0') and not net-3.0}"/>
+<!--
+    <nant buildfile="test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.build" target="test" if="${build-nms and not net-3.0}"/>
+-->
     <nant buildfile="test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build" target="test" if="${build-nms and not net-3.0}"/>
     <nant buildfile="test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.build" target="build" if="${build-quartz and not net-3.0}"/>
     <nant buildfile="test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build" target="test" if="${build-msmq-tests and not net-3.0}"/>
@@ -681,6 +687,8 @@ Build properties that may be set:
         <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.Messaging.Ems/obj" failonerror="false"/>
+        <delete dir="src/Spring/Spring.Messaging.Ems/bin" failonerror="false"/>
         <delete dir="src/Spring/Spring.Messaging/obj" failonerror="false"/>
         <delete dir="src/Spring/Spring.Messaging/bin" failonerror="false"/>
         <delete dir="src/Spring/Spring.Scheduling.Quartz/obj" failonerror="false"/>
@@ -689,6 +697,8 @@ Build properties that may be set:
         <delete dir="src/Spring/Spring.Template.Velocity/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.Testing.Microsoft/obj" failonerror="false"/>
+        <delete dir="src/Spring/Spring.Testing.Microsoft/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"/>
@@ -722,6 +732,8 @@ Build properties that may be set:
         <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.Messaging.Ems.Tests/obj" failonerror="false"/>
+        <delete dir="test/Spring/Spring.Messaging.Ems.Tests/bin" failonerror="false"/>
         <delete dir="test/Spring/Spring.Messaging.Tests/obj" failonerror="false"/>
         <delete dir="test/Spring/Spring.Messaging.Tests/bin" failonerror="false"/>
         <delete dir="test/Spring/Spring.Scheduling.Quartz.Tests/obj" failonerror="false"/>
@@ -730,6 +742,8 @@ Build properties that may be set:
         <delete dir="test/Spring/Spring.Template.Velocity.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.Microsoft.Tests/obj" failonerror="false"/>
+        <delete dir="test/Spring/Spring.Testing.Microsoft.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"/>
 
@@ -764,21 +778,21 @@ Build properties that may be set:
 
 
   <target name="package" depends="set-package-configuration" description="Build and Package distribution">
-
+<!--
     <property name="project.build.sign" value="true"/>
     <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.sign" value="true"/>
     <property name="project.build.package" value="true"/>
-
+<!--
     <call target="build-all-function"/>
-
-    <call target="docs"/>
+-->
+    <call target="doc-sdk"/>
 
     <call target="package-release-files"/>
 
@@ -861,7 +875,9 @@ Build properties that may be set:
 
   <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.1" />
+-->
     <call target="${nant.target.root.name}-2.0" />
     <call target="${nant.target.root.name}-3.0" />
 
@@ -1011,7 +1027,6 @@ Build properties that may be set:
     <echo message="Current package directory = ${current.package.dir}"/>
     <copy todir="${current.package.dir}">
       <fileset>
-        <include name="${solution.file.2002}"/>
         <include name="${solution.file.2003}"/>
         <include name="${solution.file.2005}"/>
         <include name="${solution.file.2008}"/>
@@ -1020,7 +1035,8 @@ Build properties that may be set:
         <include name="license.txt"/>
         <include name="Spring.build"/>
         <include name="Spring.include"/>
-        <include name="BreakingChanges-1.2.txt"/>
+        <include name="common-project.include"/>
+        <include name="BreakingChanges-1.3.txt"/>
         <!-- exclude VS.Net stuff -->
         <exclude name="**/sdk-web/**"/>
         <exclude name="**/*.suo"/>
@@ -1050,10 +1066,6 @@ Build properties that may be set:
           <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"/>
@@ -1082,6 +1094,14 @@ Build properties that may be set:
           <include name="**/Spring.Testing.NUnit.xml"/>
           <include name="**/Spring.Testing.NUnit.pdb"/>
 
+          <include name="**/Spring.Testing.Microsoft.dll"/>
+          <include name="**/Spring.Testing.Microsoft.xml"/>
+          <include name="**/Spring.Testing.Microsoft.pdb"/>
+
+          <include name="**/Spring.Messaging.Ems.dll"/>
+          <include name="**/Spring.Messaging.Ems.xml"/>
+          <include name="**/Spring.Messaging.Ems.pdb"/>
+
           <include name="**/Spring.Messaging.Nms.dll"/>
           <include name="**/Spring.Messaging.Nms.xml"/>
           <include name="**/Spring.Messaging.Nms.pdb"/>
@@ -1098,7 +1118,6 @@ Build properties that may be set:
           <include name="**/Spring.Template.Velocity.xml"/>
           <include name="**/Spring.Template.Velocity.pdb"/>
 
-          <include name="**/antlr.runtime.dll"/>
           <include name="**/Common.Logging.dll"/>
 
           <exclude name="**/3.0/**"/>
@@ -1107,6 +1126,7 @@ Build properties that may be set:
           <exclude name="**/examples/**"/>
           <exclude name="**/results/**"/>
           <exclude name="mono/**"/>
+          <exclude name="mono/**"/>
         </fileset>
       </copy>
     </if>
@@ -1127,7 +1147,6 @@ Build properties that may be set:
           <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"/>
@@ -1151,9 +1170,11 @@ Build properties that may be set:
         <include name="**/sr/**"/>
         <include name="**/sr-SP-Cyrl/**"/>
         <include name="**/sr-Cyrl-CS/**"/>
+        <include name="**/mpollack*/**"/>
         <include name="**/results/**"/>
         <include name="**/release/Spring/**"/>
         <include name="**/debug/Spring/**"/>
+        <include name="**/debug/bin/**"/>
       </fileset>
     </delete>
 
@@ -1176,12 +1197,12 @@ Build properties that may be set:
           <include name="**/DotNetMock*.dll"/>
           <include name="**/log4net.dll"/>
           <include name="**/Common.Logging.dll"/>
-          <include name="**/Common.Logging.Log4Net.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="**/NVelocity.*"/>
           <include name="**/System.Web.Extensions.dll"/>
           <include name="**/Apache.NMS.dll"/>
           <include name="**/Apache.NMS.pdb"/>
@@ -1190,16 +1211,8 @@ Build properties that may be set:
           <include name="**/Quartz.dll"/>
           <include name="**/Nullables.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"/>
+          <exclude name="**/TIBCO.EMS.ADMIN.dll"/>
+          <exclude name="**/TIBCO.EMS.dll"/>
         </fileset>
       </copy>
     </if>
@@ -1266,13 +1279,13 @@ Build properties that may be set:
     <!-- 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"/>
+          file="src/Spring/Spring.Core/Objects/Factory/Xml/spring-objects-1.3.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"/>
+          file="src/Spring/Spring.Core/Validation/Config/spring-validation-1.3.xsd"/>
 
 
     <copy todir="${current.package.dir}/doc/schema"
@@ -1413,7 +1426,7 @@ Build properties that may be set:
     <property name="build-data" value="true"/>
     <property name="build-services" value="true"/>
     <property name="build-testing" value="true"/>
-    <property name="build-testing-mstest" value="false"/>
+    <property name="build-testing-mstest" value="false" overwrite="false"/>
     <property name="build-winservices" value="true"/>
     <property name="build-web" value="true"/>
     <property name="solution.file" value="Spring.Net.sln"/>
@@ -1446,11 +1459,10 @@ Build properties that may be set:
     <property name="build-data" value="true"/>
     <property name="build-services" value="true"/>
     <property name="build-testing" value="true"/>
-    <property name="build-testing-mstest" value="false"/>
+    <property name="build-testing-mstest" value="false" overwrite="false"/>
     <property name="build-winservices" value="true"/>
     <property name="build-web" value="true"/>
     <property name="build-examples" value="true"/>
-    <property name="solution.file.2002" value="Spring.Net.2002.sln"/>
     <property name="solution.file.2003" value="Spring.Net.2003.sln"/>
     <property name="solution.file.2005" value="Spring.Net.2005.sln"/>
     <property name="solution.file.2008" value="Spring.Net.2008.sln"/>
@@ -1461,15 +1473,16 @@ Build properties that may be set:
       <include name="src/Spring/Spring.Web.Extensions/**"/>
       <include name="src/Spring/Spring.Services/**"/>
       <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.Data.NHibernate20/**"/>
       <include name="src/Spring/Spring.Data.NHibernate21/**"/>
       <include name="src/Spring/Spring.Messaging/**"/>
       <include name="src/Spring/Spring.Messaging.Nms/**"/>
+      <include name="src/Spring/Spring.Messaging.Ems/**"/>
       <include name="src/Spring/Spring.Scheduling.Quartz/**"/>
       <include name="src/Spring/Spring.Template.Velocity/**"/>
       <include name="src/Spring/Spring.Testing.NUnit/**"/>
+      <include name="src/Spring/Spring.Testing.Microsoft/**"/>
       <include name="src/Spring/CommonAssemblyInfo.cs"/>
 
       <include name="test/Spring/Spring.Core.Tests/**"/>
@@ -1478,7 +1491,6 @@ Build properties that may be set:
       <include name="test/Spring/Spring.Services.Tests/**"/>
       <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.Data.NHibernate20.Tests/**"/>
       <include name="test/Spring/Spring.Data.NHibernate20.Integration.Tests/**"/>
@@ -1486,9 +1498,11 @@ Build properties that may be set:
       <include name="test/Spring/Spring.Data.NHibernate21.Integration.Tests/**"/>
       <include name="test/Spring/Spring.Messaging.Tests/**"/>
       <include name="test/Spring/Spring.Messaging.Nms.Tests/**"/>
+      <include name="test/Spring/Spring.Messaging.Ems.Tests/**"/>
       <include name="test/Spring/Spring.Scheduling.Quartz.Tests/**"/>
       <include name="test/Spring/Spring.Template.Velocity.Tests/**"/>
       <include name="test/Spring/Spring.Testing.NUnit.Tests/**"/>
+      <include name="test/Spring/Spring.Testing.Microsoft.Tests/**"/>
       <include name="test/Spring/CommonAssemblyInfo.cs"/>
 
       <include name="examples/Spring/Spring.Examples.build"/>
@@ -1509,6 +1523,7 @@ Build properties that may be set:
       <include name="examples/SpringAir/src/SpringAir.Web.2005/bin/*.refresh"/>
       <include name="examples/Spring/Spring.Scheduling.Quartz.Example/**"/>
       <include name="examples/Spring/Spring.NmsQuickStart/**"/>
+      <include name="examples/Spring/Spring.EmsQuickStart/**"/>
       <include name="examples/Spring/Spring.MsmqQuickStart/**"/>
       <include name="examples/Spring/Spring.WcfQuickStart/**"/>
       <include name="examples/Spring/Spring.Scheduling.Quartz.Example/**"/>
diff --git a/doc/reference/src/index.xml b/doc/reference/src/index.xml
index 5610d79d..8c39d20b 100644
--- a/doc/reference/src/index.xml
+++ b/doc/reference/src/index.xml
@@ -62,8 +62,8 @@
   <info>
     <title>The Spring.NET Framework</title>
     <subtitle>Reference Documentation</subtitle>
-    <releaseinfo>Version 1.2.1</releaseinfo>
-    <pubdate>Last Updated July xx, 2009 <ulink url="http://www.springframework.net/doc-latest/reference/html/index.html">(Latest documentation)</ulink></pubdate>
+    <releaseinfo>Version 1.3.0 RC1</releaseinfo>
+    <pubdate>Last Updated July 30, 2009 <ulink url="http://www.springframework.net/doc-latest/reference/html/index.html">(Latest documentation)</ulink></pubdate>
     <authorgroup>
       <author>
         <firstname>Mark</firstname>
diff --git a/doc/sdk/Spring.NET-net-2.0.ndoc b/doc/sdk/Spring.NET-net-2.0.ndoc
index 0522584f..3299de93 100644
--- a/doc/sdk/Spring.NET-net-2.0.ndoc
+++ b/doc/sdk/Spring.NET-net-2.0.ndoc
@@ -1,18 +1,20 @@
 <project SchemaVersion="1.3">
     <assemblies>
+        <assembly location="..\..\build\net\2.0\debug\Spring.Testing.Microsoft.dll" documentation="..\..\build\net\2.0\debug\Spring.Testing.Microsoft.xml" />
         <assembly location="..\..\build\net\2.0\debug\Spring.Testing.NUnit.dll" documentation="..\..\build\net\2.0\debug\Spring.Testing.NUnit.xml" />
         <assembly location="..\..\build\net\2.0\debug\Spring.Web.dll" documentation="..\..\build\net\2.0\debug\Spring.Web.xml" />
         <assembly location="..\..\build\net\2.0\debug\Spring.Aop.dll" documentation="..\..\build\net\2.0\debug\Spring.Aop.xml" />
         <assembly location="..\..\build\net\2.0\debug\Spring.Core.dll" documentation="..\..\build\net\2.0\debug\Spring.Core.xml" />
         <assembly location="..\..\build\net\2.0\debug\Spring.Data.dll" documentation="..\..\build\net\2.0\debug\Spring.Data.xml" />
-        <assembly location="..\..\build\net\2.0\debug\Spring.Data.NHibernate.dll" documentation="..\..\build\net\2.0\debug\Spring.Data.NHibernate.xml" />
         <assembly location="..\..\build\net\2.0\debug\Spring.Data.NHibernate12.dll" documentation="..\..\build\net\2.0\debug\Spring.Data.NHibernate12.xml" />
         <assembly location="..\..\build\net\2.0\debug\Spring.Data.NHibernate20.dll" documentation="..\..\build\net\2.0\debug\Spring.Data.NHibernate20.xml" />
         <assembly location="..\..\build\net\2.0\debug\Spring.Data.NHibernate21.dll" documentation="..\..\build\net\2.0\debug\Spring.Data.NHibernate21.xml" />
         <assembly location="..\..\build\net\2.0\debug\Spring.Messaging.dll" documentation="..\..\build\net\2.0\debug\Spring.Messaging.xml" />
+        <assembly location="..\..\build\net\2.0\debug\Spring.Messaging.Ems.dll" documentation="..\..\build\net\2.0\debug\Spring.Messaging.Ems.xml" />
         <assembly location="..\..\build\net\2.0\debug\Spring.Messaging.Nms.dll" documentation="..\..\build\net\2.0\debug\Spring.Messaging.Nms.xml" />
         <assembly location="..\..\build\net\2.0\debug\Spring.Scheduling.Quartz.dll" documentation="..\..\build\net\2.0\debug\Spring.Scheduling.Quartz.xml" />
         <assembly location="..\..\build\net\2.0\debug\Spring.Services.dll" documentation="..\..\build\net\2.0\debug\Spring.Services.xml" />
+        <assembly location="..\..\build\net\2.0\debug\Spring.Template.Velocity.dll" documentation="..\..\build\net\2.0\debug\Spring.Template.Velocity.xml" />
     </assemblies>
     <referencePaths>
         <referencePath path="..\..\lib\NHibernate12\net\2.0" />
@@ -22,8 +24,8 @@
     <documenters>
         <documenter name="MSDN">
             <property name="OutputDirectory" value=".\target\tmp" />
-            <property name="HtmlHelpName" value="Spring.NET-1.2.1-SDK" />
-            <property name="Title" value="Spring.NET 1.2.1 for NET 2.0 API Reference" />
+            <property name="HtmlHelpName" value="Spring.NET-1.3.0-RC1-SDK" />
+            <property name="Title" value="Spring.NET 1.3.0 RC1 for NET 2.0 API Reference" />
             <property name="ShowVisualBasic" value="True" />
             <property name="MergeAssemblies" value="False" />
             <property name="RootPageTOCName" value="Introduction" />
diff --git a/doc/sdk/default.html b/doc/sdk/default.html
index 785eb04a..6aea225e 100644
--- a/doc/sdk/default.html
+++ b/doc/sdk/default.html
@@ -2,7 +2,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5" />
-    <title>Spring.NET 1.2.1 SDK Reference Documentation</title>
+    <title>Spring.NET 1.3.0 RC1 SDK Reference Documentation</title>
     <xml>
     </xml>
     <link rel="stylesheet" type="text/css" href="MSDN.css" />
@@ -12,7 +12,7 @@
       <div id="bannerrow1">
         <table class="bannerparthead" cellspacing="0">
           <tr id="hdr">
-            <td class="runninghead">Spring.NET 1.2.1 SDK Reference Documentation</td>
+            <td class="runninghead">Spring.NET 1.3.0 RC1 SDK Reference Documentation</td>
             <td class="product">
             </td>
           </tr>
@@ -262,4 +262,4 @@ While dependecy injection generally leads to classes that are easier to unit tes
       </div>
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/Spring/CommonAssemblyInfo.cs b/src/Spring/CommonAssemblyInfo.cs
index b386d887..9c909796 100644
--- a/src/Spring/CommonAssemblyInfo.cs
+++ b/src/Spring/CommonAssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: AssemblyConfiguration("net-2.0.win32; Release")]
 #endif
 [assembly: AssemblyCompany("http://www.springframework.net")]
-[assembly: AssemblyProduct("Spring.NET Framework 1.2.1")]
+[assembly: AssemblyProduct("Spring.NET Framework 1.3.0")]
 [assembly: AssemblyCopyright("Copyright 2002-2009 Spring.NET Framework Team.")]
 [assembly: AssemblyTrademark("Apache License, Version 2.0")]
 [assembly: AssemblyCulture("")]
@@ -31,9 +31,9 @@ using System.Reflection;
 //
 // 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.2.1.11001")]
+[assembly: AssemblyVersion("1.3.0.11001")]
 #else
-[assembly: AssemblyVersion("1.2.1.20001")]
+[assembly: AssemblyVersion("1.3.0.20001")]
 #endif
 
 //
diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsConnectionFactory.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsConnectionFactory.cs
index e2b0af7e..64f15131 100644
--- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsConnectionFactory.cs
+++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsConnectionFactory.cs
@@ -266,7 +266,7 @@ namespace Spring.Messaging.Ems.Common
             {
                 nativeConnectionFactory.SetSSLProxyAuth(this.sslProxyAuthUsername, this.sslProxyAuthPassword);
             }
-            if (sslProxyHost != null && sslProxyPort != null)
+            if (sslProxyHost != null && sslProxyPort != 0)
             {
                 nativeConnectionFactory.SetSSLProxy(this.sslProxyHost, this.sslProxyPort);
             }
diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/CachedSession.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/CachedSession.cs
index 5e8a0f66..0d05a6ad 100644
--- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/CachedSession.cs
+++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/CachedSession.cs
@@ -50,7 +50,6 @@ namespace Spring.Messaging.Ems.Connections
         private int sessionCacheSize;
         private IDictionary cachedProducers = new Hashtable();
         private IDictionary cachedConsumers = new Hashtable();
-        private IMessageProducer cachedUnspecifiedDestinationMessageProducer;
         private bool shouldCacheProducers;
         private bool shouldCacheConsumers;
         private bool transactionOpen = false;
diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/EmsTemplate.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/EmsTemplate.cs
index 6c813607..597b3343 100644
--- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/EmsTemplate.cs
+++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/EmsTemplate.cs
@@ -394,7 +394,7 @@ namespace Spring.Messaging.Ems.Core
             set { timeToLive = value; }
         }
 
-        
+        /*        
         /// <summary>
         /// Gets or sets a value indicating whether the EmsTemplate should itself
         /// be responsible for caching EMS Connection/Session/MessageProducer as compared to
@@ -404,7 +404,7 @@ namespace Spring.Messaging.Ems.Core
         /// </summary>
         /// <remarks>Connection/Session/MessageProducer are thread-safe classes in TIBCO EMS.</remarks>
         /// <value><c>true</c> to locally cache ems resources; otherwise, <c>false</c>.</value>
-/*        virtual public bool CacheEmsResources
+        virtual public bool CacheEmsResources
         {
             get { return cacheEmsResources; }
             set { cacheEmsResources = value; }
@@ -592,7 +592,7 @@ namespace Spring.Messaging.Ems.Core
                 return session.CreateConsumer(destination, messageSelector);
             }
         }
-
+        /*
         /// <summary>Create a EMS Connection via this template's ConnectionFactory.
         /// </summary>
         /// <remarks>If CacheJmsResource is true, then the connection 
@@ -602,7 +602,7 @@ namespace Spring.Messaging.Ems.Core
         /// <returns>A EMS Connection
         /// </returns>
         /// <exception cref="EMSException">If there is any problem accessing the EMS API</exception>
-/*        protected override IConnection CreateConnection()
+        protected override IConnection CreateConnection()
         {
             if (CacheEmsResources)
             {
@@ -618,7 +618,7 @@ namespace Spring.Messaging.Ems.Core
                 return ConnectionFactory.CreateConnection();
             }
         }*/
-
+        /*
         /// <summary> Create a EMS Session for the given Connection.
         /// </summary>
         /// <remarks>If CacheJmsResource is true, then the session 
@@ -630,7 +630,7 @@ namespace Spring.Messaging.Ems.Core
         /// <returns> the new EMS Session
         /// </returns>
         /// <exception cref="EMSException">If there is any problem accessing the EMS API</exception>
-/*        protected override ISession CreateSession(IConnection con)
+        protected override ISession CreateSession(IConnection con)
         {
             if (CacheEmsResources)
             {
diff --git a/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2008.csproj b/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2008.csproj
index 91463f2b..61a0f349 100644
--- a/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2008.csproj
+++ b/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2008.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{900E3839-301E-48B1-BAEB-B6645620ACFF}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -39,6 +39,8 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>..\..\..\build\VS.NET.2005\Spring.Messaging.Ems\Debug\Spring.Messaging.Ems.xml</DocumentationFile>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <NoWarn>1591,0618</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -135,7 +137,8 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Messaging\Ems\Config\spring-ems-1.2.xsd">
-      <SubType>Designer</SubType>
+      <SubType>
+      </SubType>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
diff --git a/test/Spring/CommonAssemblyInfo.cs b/test/Spring/CommonAssemblyInfo.cs
index 98fc164a..edeb7b1f 100644
--- a/test/Spring/CommonAssemblyInfo.cs
+++ b/test/Spring/CommonAssemblyInfo.cs
@@ -24,7 +24,7 @@ using System.Runtime.CompilerServices;
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.2.1.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the
diff --git a/test/Spring/Spring.Messaging.Ems.Tests/Messaging/Ems/Config/EmsNamespaceHandlerTests.cs b/test/Spring/Spring.Messaging.Ems.Tests/Messaging/Ems/Config/EmsNamespaceHandlerTests.cs
index 6d289229..bc117bfe 100644
--- a/test/Spring/Spring.Messaging.Ems.Tests/Messaging/Ems/Config/EmsNamespaceHandlerTests.cs
+++ b/test/Spring/Spring.Messaging.Ems.Tests/Messaging/Ems/Config/EmsNamespaceHandlerTests.cs
@@ -37,7 +37,6 @@ namespace Spring.Messaging.Ems.Config
     /// This class contains tests for 
     /// </summary>
     /// <author>Mark Pollack</author>
-    /// <version>$Id:$</version>
     [TestFixture]
     public class EmsNamespaceHandlerTests
     {
diff --git a/test/Spring/Spring.Messaging.Ems.Tests/Messaging/Ems/Config/EmsNamespaceHandlerTests.xml b/test/Spring/Spring.Messaging.Ems.Tests/Messaging/Ems/Config/EmsNamespaceHandlerTests.xml
index 5e326b6a..ad631dd3 100644
--- a/test/Spring/Spring.Messaging.Ems.Tests/Messaging/Ems/Config/EmsNamespaceHandlerTests.xml
+++ b/test/Spring/Spring.Messaging.Ems.Tests/Messaging/Ems/Config/EmsNamespaceHandlerTests.xml
@@ -17,10 +17,13 @@
 
 
   <!-- the default ConnectionFactory -->
-  <object id="ConnectionFactory" type="TIBCO.EMS.ConnectionFactory, TIBCO.EMS"/>
-
-  <object id="testConnectionFactory" type="TIBCO.EMS.ConnectionFactory, TIBCO.EMS"/>
-
+  <object id="connectionFactory" type="Spring.Messaging.Ems.Common.EmsConnectionFactory, Spring.Messaging.Ems">
+    <constructor-arg index="0" value="tcp://localhost:7222"/>
+  </object>
+  
+  <object id="testConnectionFactory" type="Spring.Messaging.Ems.Common.EmsConnectionFactory, Spring.Messaging.Ems">
+    <constructor-arg index="0" value="tcp://localhost:7222"/>
+  </object>
 
   <!--
   <bean id="testActivationSpecFactory" class="org.springframework.jms.listener.endpoint.StubJmsActivationSpecFactory"/>
diff --git a/test/Spring/Spring.Messaging.Ems.Tests/Messaging/Ems/Core/SimpleMessageConverterTests.cs b/test/Spring/Spring.Messaging.Ems.Tests/Messaging/Ems/Core/SimpleMessageConverterTests.cs
index 2a4bc01e..b74cfdd5 100644
--- a/test/Spring/Spring.Messaging.Ems.Tests/Messaging/Ems/Core/SimpleMessageConverterTests.cs
+++ b/test/Spring/Spring.Messaging.Ems.Tests/Messaging/Ems/Core/SimpleMessageConverterTests.cs
@@ -52,7 +52,7 @@ namespace Spring.Messaging.Ems.Core
         {
             //ConnectionFactory cf = new ConnectionFactory("tcp://localhost:7222");
             //Connection c = cf.CreateConnection();
-            Session tibcoSession = null;// c.CreateSession(false, SessionMode.AutoAcknowledge);
+            //Session tibcoSession = null;// c.CreateSession(false, SessionMode.AutoAcknowledge);
             mocks = new MockRepository();
             session = (ISession) mocks.CreateMock(typeof (ISession));
             converter = new SimpleMessageConverter();
diff --git a/test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.2008.csproj b/test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.2008.csproj
index a843eab3..c4f1713f 100644
--- a/test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.2008.csproj
+++ b/test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.2008.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -38,6 +38,8 @@
     <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <NoWarn>1591,0618,0067</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>