From bcde9cefa01368b4fc38b32a7f835fcbe38aa439 Mon Sep 17 00:00:00 2001
From: markpollack <mark.pollack@springsource.com>
Date: Fri, 7 Nov 2008 22:20:40 +0000
Subject: [PATCH] SPRNET-1082 - Bad packaging in 3.5 lib directory misc doc
 updates

---
 Spring.build                                  | 55 ++++++++++---------
 doc/reference/src/aop-aspect-library.xml      | 19 ++++---
 doc/reference/src/validation.xml              | 52 +++++++++++++++++-
 .../Spring.Services/Spring.Services.build     | 25 +++++++++
 .../Spring.Services.Tests.build               | 16 +++++-
 5 files changed, 128 insertions(+), 39 deletions(-)

diff --git a/Spring.build b/Spring.build
index 9e641ced..0ba84923 100644
--- a/Spring.build
+++ b/Spring.build
@@ -315,40 +315,42 @@
     <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' or nant.settings.currentframework == 'mono-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' or nant.settings.currentframework == 'mono-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' or nant.settings.currentframework == 'mono-2.0')}"/>
-    <nant buildfile="src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'mono-2.0')}"/>
+    <nant buildfile="src/Spring/Spring.Core/Spring.Core.build" target="build" if="${not net-3.0}"/>
+    <nant buildfile="src/Spring/Spring.Aop/Spring.Aop.build" target="build" if="${build-aop and not net-3.0}"/>
+    <nant buildfile="src/Spring/Spring.Web/Spring.Web.build" target="build" if="${build-web and not net-3.0}"/>
+    <nant buildfile="src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build" target="build" if="${build-web and (nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'mono-2.0') and not net-3.0}"/>
+    <nant buildfile="src/Spring/Spring.Data/Spring.Data.build" target="build" if="${build-data and not net-3.0}"/>
+    <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' or nant.settings.currentframework == 'mono-2.0') and not net-3.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' or nant.settings.currentframework == 'mono-2.0') and not net-3.0}"/>
+    <nant buildfile="src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'mono-2.0') and not net-3.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-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}"/>
+    <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.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}"/>
 
 
     <!-- build examples -->
 
-    <nant buildfile="examples/Spring/Spring.Examples.build" target="build" if="${build-examples and not using-clover}"/>
+    <nant buildfile="examples/Spring/Spring.Examples.build" target="build" if="${build-examples and not using-clover and not net-3.0}"/>
 
     <!-- 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.Data.NHibernate20.Tests/Spring.Data.NHibernate20.Tests.build" target="test" if="${build-data and nant.settings.currentframework == 'net-2.0'}"/>
-    <nant buildfile="test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.build" target="test" if="${build-data and nant.settings.currentframework == 'net-2.0'}"/>
+    <nant buildfile="test/Spring/Spring.Core.Tests/Spring.Core.Tests.build" target="test" if="${not net-3.0}"/>
+    <nant buildfile="test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.build" target="test" if="${build-aop and not net-3.0}"/>
+    <nant buildfile="test/Spring/Spring.Data.Tests/Spring.Data.Tests.build" target="test" if="${build-data and not net-3.0}"/>
+    <nant buildfile="test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build" target="test" if="${build-data and not net-3.0}"/>
+    <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') and not net-3.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') and not net-3.0}"/>
+    <nant buildfile="test/Spring/Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate20.Tests.build" target="test" 
+                 if="${build-data and nant.settings.currentframework == 'net-2.0' and not net-3.0}"/>
+    <nant buildfile="test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.build" target="test" 
+                 if="${build-data and nant.settings.currentframework == 'net-2.0' and not net-3.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="${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}"/>
+    <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.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}"/>
   </target>
 
   <target name="compile-net-1.0" description="Builds .NET Framework 1.0 version"
@@ -957,7 +959,6 @@
         </fileset>
       </copy>
     </if>
-
     <if test="${property::exists('build.allnamespaces') and build.allnamespaces}">
       <copy todir="${current.package.dir}/bin/net">
         <fileset basedir="./build/net">
diff --git a/doc/reference/src/aop-aspect-library.xml b/doc/reference/src/aop-aspect-library.xml
index 449dc45f..7edf03a3 100644
--- a/doc/reference/src/aop-aspect-library.xml
+++ b/doc/reference/src/aop-aspect-library.xml
@@ -755,15 +755,16 @@ on exception (#e is T(System.ArithmeticException)) retry 3x rate (1*#n + 0.5)</p
     <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>
+    an arbitrary .NET object. Spring provides additional support for the
+    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 also 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
diff --git a/doc/reference/src/validation.xml b/doc/reference/src/validation.xml
index f3bab082..9945c2a1 100644
--- a/doc/reference/src/validation.xml
+++ b/doc/reference/src/validation.xml
@@ -16,7 +16,12 @@
  * limitations under the License.
  */
 -->
-<chapter xml:id="validation" xmlns="http://docbook.org/ns/docbook" version="5">
+<chapter version="5" xml:id="validation" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <title>Validation Framework</title>
 
   <section>
@@ -351,6 +356,49 @@
 
               <entry>not null or an empty string</entry>
             </row>
+
+            <row>
+              <entry>system.DateTime</entry>
+
+              <entrytbl cols="1">
+                <tbody>
+                  <row>
+                    <entry>Not System.DateTime.MinValue and not
+                    system.DateTime.MaxValue</entry>
+                  </row>
+                </tbody>
+              </entrytbl>
+            </row>
+
+            <row>
+              <entry>One of the number types.</entry>
+
+              <entrytbl cols="1">
+                <tbody>
+                  <row>
+                    <entry>not zero</entry>
+                  </row>
+                </tbody>
+              </entrytbl>
+            </row>
+
+            <row>
+              <entry>System.Char</entry>
+
+              <entrytbl cols="1">
+                <tbody>
+                  <row>
+                    <entry>Not System.Char.MinValue or whitespace.</entry>
+                  </row>
+                </tbody>
+              </entrytbl>
+            </row>
+
+            <row>
+              <entry>Any reference type other than System.String</entry>
+
+              <entry>not null</entry>
+            </row>
           </tbody>
         </tgroup>
       </table>
@@ -880,4 +928,4 @@ bool userInfoIsValid = userInfoValidator.Validate(userInfo, errors);
       </section>
     </section>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/src/Spring/Spring.Services/Spring.Services.build b/src/Spring/Spring.Services/Spring.Services.build
index 0407d067..478f0ede 100644
--- a/src/Spring/Spring.Services/Spring.Services.build
+++ b/src/Spring/Spring.Services/Spring.Services.build
@@ -7,7 +7,32 @@
       * current.build.defines.csc - framework-specific build defines for C# compiler
 -->
   <target name="build">
+    <if test="${net-3.0.installed and net-3.0}">
+      <property name="bin.dir.to.use" value="${current.bin.dir}\..\..\2.0\${project.build.config}"/>
+      <copy todir="${current.bin.dir}">
+	<fileset basedir="${bin.dir.to.use}">
+	  <include name="*.dll"/>
+	  <include name="*.pdb"/>
+	  <include name="*.xml"/>
+	  <exclude name="Spring.Services.dll"/>
+	  <exclude name="Spring.Services.pdb"/>
+	  <exclude name="Spring.Services.xml"/>
+        </fileset>
+      </copy>
+    </if>
     
+    <if test="${net-3.0.installed and net-3.0}">
+      <copy todir="${current.bin.dir}">
+	<fileset basedir="${bin.dir.to.use}">
+	  <include name="*.dll"/>
+	  <include name="*.pdb"/>
+	  <include name="*.xml"/>
+	  <exclude name="Spring.Services.dll"/>
+	  <exclude name="Spring.Services.pdb"/>
+	  <exclude name="Spring.Services.xml"/>
+        </fileset>
+      </copy>
+    </if>
     <!-- build Spring.Services -->
     <csc target="library" define="${current.build.defines.csc}"
 		     warnaserror="true"
diff --git a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build
index c3064546..f1f5d870 100644
--- a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build
+++ b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build
@@ -7,7 +7,20 @@
       * current.build.defines.csc - framework-specific build defines for C# compiler
 -->
   <target name="build">
-    <echo message="current.bin.dir = ${current.bin.dir}"/>
+    <if test="${net-3.0.installed and net-3.0}">
+      <property name="bin.dir.to.use" value="${current.bin.dir}\..\..\2.0\${project.build.config}"/>
+      <copy todir="${current.bin.dir}">
+	<fileset basedir="${bin.dir.to.use}">
+	  <include name="*.dll"/>
+	  <include name="*.pdb"/>
+	  <include name="*.xml"/>
+	  <exclude name="Spring.Services.dll"/>
+	  <exclude name="Spring.Services.pdb"/>
+	  <exclude name="Spring.Services.xml"/>
+        </fileset>
+      </copy>
+    </if>
+
     <!-- build Spring.Services.Tests -->
     <csc target="library" define="${current.build.defines.csc}"
 		     warnaserror="true"
@@ -49,6 +62,7 @@
           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"