diff --git a/Spring.build b/Spring.build
index b8e08ab9..b4e770e8 100644
--- a/Spring.build
+++ b/Spring.build
@@ -308,6 +308,7 @@
     <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-nms}"/>
+    <nant buildfile="src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.build" target="build" if="${build-quartz}"/>
     <nant buildfile="src/Spring/Spring.Messaging/Spring.Messaging.build" target="build" if="${build-msmq}"/>
 
 
@@ -328,6 +329,7 @@
     <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="${build-nms}"/>
+    <nant buildfile="test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.build" target="build" if="${build-quartz}"/>
     <nant buildfile="test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build" target="test" if="${build-msmq-tests}"/>
   </target>
 
@@ -339,6 +341,7 @@
     <!-- disable namespaces not supported in net-1.0 -->
     <property name="build-web" value="false" />
     <property name="build-nms" value="false" />
+    <property name="build-quartz" value="false" />
     <property name="build-msmq" value="false" />
     <property name="build-msmq-tests" value="false" />
     <call target="compile-test" />
@@ -349,6 +352,7 @@
     <call target="copykeys" if="${project.build.sign}"/>
     <call target="common.generate-assemblyinfo"/>
     <property name="build-nms" value="false" />
+    <property name="build-quartz" value="true" />
     <property name="build-msmq" value="false" />
     <property name="build-msmq-tests" value="false" />
     <call target="compile-test" />
@@ -359,6 +363,7 @@
     <call target="copykeys" if="${project.build.sign}"/>
     <call target="common.generate-assemblyinfo"/>
     <property name="build-nms" value="true" />
+    <property name="build-quartz" value="true" />
     <property name="build-msmq" value="true" />
     <property name="build-msmq-tests" value="false" />
     <call target="compile-test" />
@@ -368,6 +373,10 @@
           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"/>
+    <property name="build-nms" value="true" />
+    <property name="build-quartz" value="true" />
+    <property name="build-msmq" value="false" />
+    <property name="build-msmq-tests" value="false" />
     <call target="compile-test" />
   </target>
 
diff --git a/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.build b/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.build
index a21913f3..5494bffd 100644
--- a/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.build
+++ b/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.build
@@ -17,7 +17,7 @@
 			<arg line="${compiler.args}"/>
 			<nowarn>
 				<warning number="${nowarn.numbers.test},0169" />
-				<warning number=",0219,0414" if="${nant.settings.currentframework=='mono-2.0'}"/>
+				<warning number="0219,0414" if="${nant.settings.currentframework=='mono-2.0'}"/>
 			</nowarn>
 			<sources failonempty="true">
 				<include name="**/*.cs" />
diff --git a/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2003.csproj b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2003.csproj
index 785fe1a0..12422468 100644
--- a/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2003.csproj
+++ b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2003.csproj
@@ -114,56 +114,36 @@
         <Files>
             <Include>
                 <File
-                    RelPath = "Context\ILifecycle.cs"
+                    RelPath = "Messaging\Nms\Config\MessageListenerContainerObjectDefinitionParser.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Messaging\.DS_Store"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "Messaging\Nms\IMessageCreator.cs"
+                    RelPath = "Messaging\Nms\Config\NmsNamespaceParser.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Messaging\Nms\IMessageListener.cs"
+                    RelPath = "Messaging\Nms\Config\spring-nms-1.2.xsd"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Connections\CachedMessageProducer.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Messaging\Nms\IMessagePostProcessor.cs"
+                    RelPath = "Messaging\Nms\Connections\CachedSession.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Messaging\Nms\INmsOperations.cs"
+                    RelPath = "Messaging\Nms\Connections\CachingConnectionFactory.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"
+                    RelPath = "Messaging\Nms\Connections\ChainedExceptionListener.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
@@ -172,23 +152,108 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "Messaging\Nms\Connections\IDecoratorSession.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Connections\ISmartConnectionFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Messaging\Nms\Connections\NmsResourceHolder.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "Messaging\Nms\Connections\NmsTransactionManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Connections\SingleConnectionFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Messaging\Nms\Connections\SynchedLocalTransactionFailedException.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Messaging\Nms\Listener\AbstractMessageListenerContainer.cs"
+                    RelPath = "Messaging\Nms\Core\IExceptionListener.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Messaging\Nms\Listener\DefaultMessageListenerContainer.cs"
+                    RelPath = "Messaging\Nms\Core\IMessageCreator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Core\IMessageListener.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Core\IMessagePostProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Core\INmsOperations.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Core\IProducerCallback.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Core\ISessionCallback.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Core\MessageCreatorDelegate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Core\MessagePostProcessorDelegate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Core\NmsGatewaySupport.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Core\NmsTemplate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Core\ProducerDelegate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Core\SessionDelegate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Listener\AbstractListenerContainer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Listener\AbstractMessageListenerContainer.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
@@ -197,23 +262,33 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "Messaging\Nms\Listener\LocallyExposedNmsResourceHolder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Messaging\Nms\Listener\SimpleMessageListenerContainer.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "Messaging\Nms\Listener\Adapter\ListenerExecutionFailedException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Messaging\Nms\Listener\Adapter\MessageListenerAdapter.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Messaging\Nms\Support\NmsAccessor.cs"
+                    RelPath = "Messaging\Nms\Support\MessageUtils.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Messaging\Nms\Support\NmsUtils.cs"
+                    RelPath = "Messaging\Nms\Support\NmsAccessor.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
diff --git a/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build
index a90c1ea0..58c2e510 100644
--- a/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build
+++ b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build
@@ -28,6 +28,7 @@
 	    </resources>
 	    <references basedir="${current.bin.dir}">
 		<include name="*.dll" />
+		<include name="System.Data.Dll" />
 		<exclude name="${project::get-name()}.dll" />
 		<exclude name="CloverRuntime.dll" />
 	    </references>
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build
index 8ff2acbd..a1085c2d 100644
--- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build
@@ -41,6 +41,7 @@
 				<include name="System.EnterpriseServices.dll" />
 				<include name="System.Drawing.dll" />
 				<include name="System.Data.dll" />
+				<include name="System.Configuration.dll" />
 				<include name="System.Web.Services.dll" />
 				<include name="System.Runtime.Serialization.Formatters.Soap.dll" />
 				<include name="System.Windows.Forms.dll" />