From b52f540a62fb22b581beecf90acc5066db8a314f Mon Sep 17 00:00:00 2001
From: erezmazor <erezmazor@gmail.com>
Date: Fri, 5 Jun 2009 11:46:05 +0000
Subject: [PATCH] Fixed build issues: 1. Changed default Spring.build target
 for Spring.Template.Velocity.Tests to test to prevent hiding of test failures
 in CC.net build 2. Added NVelocity.dll and resource embedding in build target
 Spring.Template.Velocity.Tests.build and changed default target to test 3.
 Removed tx xmlns from test VelocityEngineFactoryObjectTests.xml

---
 Spring.build                                              | 2 +-
 .../Spring.Template.Velocity.Tests.build                  | 8 ++++++--
 .../Velocity/VelocityEngineFactoryObjectTests.xml         | 3 +--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Spring.build b/Spring.build
index 7cb025de..491a051c 100644
--- a/Spring.build
+++ b/Spring.build
@@ -383,7 +383,7 @@ Build properties that may be set:
     <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}"/>
-    <nant buildfile="test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build" target="build" if="${build-quartz and not net-3.0}"/>
+    <nant buildfile="test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build" target="test" if="${build-velocity and not net-3.0}"/>
   </target>
 
   <target name="compile-net-1.0" description="Builds .NET Framework 1.0 version"
diff --git a/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build b/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build
index 03e9e87b..7fad740e 100644
--- a/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build
+++ b/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="Spring.Template.Velocity.Tests" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<project name="Spring.Template.Velocity.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
 	<!--
         Required properties:
             * current.bin.dir           - (path) root level to build to
@@ -22,8 +22,12 @@
 			</sources>
 			<references basedir="${current.bin.dir}">
 				<include name="*.dll" />
+				<include name="Nvelocity.dll" />
 				<exclude name="${project::get-name()}.dll" />
-			</references>
+			</references>			
+			<resources basedir="." prefix="Spring.Template.Velocity.Tests" dynamicprefix="true" failonempty="true">
+				<include name="**/*.xml" />		
+			</resources>
 		</csc>
 		<copy todir="${current.bin.dir}">
 			<fileset basedir="${project::get-name()}/Data">
diff --git a/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineFactoryObjectTests.xml b/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineFactoryObjectTests.xml
index faf60682..4ff4274d 100644
--- a/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineFactoryObjectTests.xml
+++ b/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineFactoryObjectTests.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<objects xmlns="http://www.springframework.net"
-         xmlns:tx="http://www.springframework.net/tx">
+<objects xmlns="http://www.springframework.net">
     <object id="velocityEngine" type="Spring.Template.Velocity.VelocityEngineFactoryObject, Spring.Template.Velocity">
         <property name="VelocityProperties">
             <dictionary key-type="string" value-type="object">