[Nhibernate-commit] SF.net SVN: nhibernate:[4378] trunk/nhibernate

[<te...@us...>]

Revision: 4378
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4378&view=rev
Author:   tehlike
Date:     2009-05-24 12:28:07 +0000 (Sun, 24 May 2009)

Log Message:
-----------
Improvements in Build files, now parameters for nh properties such as connection string is possible. Check sample build commands.txt for sample usages

Modified Paths:
--------------
    trunk/nhibernate/build-common/common-project.xml
    trunk/nhibernate/build-common/nhibernate-properties.xml
    trunk/nhibernate/default.build
    trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.build

Modified: trunk/nhibernate/build-common/common-project.xml
===================================================================
--- trunk/nhibernate/build-common/common-project.xml	2009-05-24 10:13:22 UTC (rev 4377)
+++ trunk/nhibernate/build-common/common-project.xml	2009-05-24 12:28:07 UTC (rev 4378)
@@ -222,8 +222,11 @@
 
 	<target name="common.run-tests"
 		description="Run NUnit tests">
+		<exec program="${root.dir}/Tools/nunit/nunit-console-x86.exe">
+			<arg line="${bin.dir}/${project::get-name()}.dll /xml=${bin.dir}/${project::get-name()}.dll.result.xml" />
+		</exec>
 
-		<nunit2>
+		<!--<nunit2>
 			<formatter 
 				type="Xml" 
 				usefile="true" 
@@ -233,7 +236,7 @@
 			<test
 				assemblyname="${bin.dir}/${project::get-name()}.dll"
 				appconfig="${bin.dir}/${project::get-name()}.dll.config" />
-		</nunit2>
+		</nunit2>-->
 
 	</target>
 
@@ -250,21 +253,28 @@
 		<!-- 
 			Tell nhibernate how to connect to the test database.
 		-->
-		<xmlpoke
-			file="${app.config}"
-			xpath="/configuration/nhibernate/add[@key='hibernate.dialect']/@value"
-			value="${nhibernate.dialect}" 
-		/>
-		<xmlpoke
-			file="${app.config}"
-			xpath="/configuration/nhibernate/add[@key='hibernate.connection.driver_class']/@value"
-			value="${nhibernate.connection.driver_class}" 
-		/>
-		<xmlpoke
-			file="${app.config}"
-			xpath="/configuration/nhibernate/add[@key='hibernate.connection.connection_string']/@value"
-			value="${nhibernate.connection.connection_string}" 
-		/>
+		<xmlpoke file="${app.config}"
+			xpath="//*/hbm:property[@name='dialect']"
+			value="${nhibernate.dialect}">
+			<namespaces>
+				<namespace prefix="hbm" uri="urn:nhibernate-configuration-2.2" />
+			</namespaces>
+		</xmlpoke>
+
+		<xmlpoke file="${app.config}"
+			xpath="//*/hbm:property[@name='connection.driver_class']"
+			value="${nhibernate.connection.driver_class}">
+			<namespaces>
+				<namespace prefix="hbm" uri="urn:nhibernate-configuration-2.2" />
+			</namespaces>
+		</xmlpoke>
+		<xmlpoke file="${app.config}"
+			xpath="//*/hbm:property[@name='connection.connection_string']"
+			value="${nhibernate.connection.connection_string}">
+			<namespaces>
+				<namespace prefix="hbm" uri="urn:nhibernate-configuration-2.2" />
+			</namespaces>
+		</xmlpoke>
 	</target>
 
 	<target name="common.remove-connection-settings-from-app-config">

Modified: trunk/nhibernate/build-common/nhibernate-properties.xml
===================================================================
--- trunk/nhibernate/build-common/nhibernate-properties.xml	2009-05-24 10:13:22 UTC (rev 4377)
+++ trunk/nhibernate/build-common/nhibernate-properties.xml	2009-05-24 12:28:07 UTC (rev 4378)
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <project xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd">
-	<property name="nhibernate.dialect" value="NHibernate.Dialect.MsSql2000Dialect" />
-	<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SqlClientDriver" />
-	<property name="nhibernate.connection.connection_string" value="Server=(local);initial catalog=nhibernate;Integrated Security=SSPI" />
+	<property name="nhibernate.dialect" value="NHibernate.Dialect.MsSql2005Dialect"  overwrite="false"/>
+	<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SqlClientDriver" overwrite="false"/>
+	<property name="nhibernate.connection.connection_string" value="Server=(local);initial catalog=nhibernate;Integrated Security=SSPI" overwrite="false"/>
 </project>

Modified: trunk/nhibernate/default.build
===================================================================
--- trunk/nhibernate/default.build	2009-05-24 10:13:22 UTC (rev 4377)
+++ trunk/nhibernate/default.build	2009-05-24 12:28:07 UTC (rev 4378)
@@ -123,26 +123,9 @@
 	</target>
 
 	<target name="test" depends="init build" description="Runs all NHibernate tests for the current framework" unless="${skip.tests}">
-		<!--
 		<nant target="test">
 			<buildfiles refid="buildfiles.tests" />
 		</nant>
-		-->
-		<!-- -->
-		<foreach item="File" property="buildfile">
-			<in>
-				<items refid="buildfiles.tests" />
-			</in>
-			<do>
-				<exec program="nant.exe">
-					<arg value="-f:${buildfile}" />
-					<arg value="-t:${nant.settings.currentframework}" />
-					<arg value="-D:project.config=${project.config}" />
-					<arg value="test" />
-				</exec>
-			</do>
-		</foreach>
-		<!-- -->
 	</target>
 	
 	<target name="coverage-report" description="Builds the test coverage reports"

Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.build
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.build	2009-05-24 10:13:22 UTC (rev 4377)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.build	2009-05-24 12:28:07 UTC (rev 4378)
@@ -34,5 +34,5 @@
 		<copy file="TestEnbeddedConfig.cfg.xml" tofile="${bin.dir}/TestEnbeddedConfig.cfg.xml" />
 		<copy file="${root.dir}/src/NHibernate.DomainModel/ABC.hbm.xml" tofile="${bin.dir}/ABC.hbm.xml" />
 	</target>
-	<target name="test" depends="init build common.run-tests" />
+	<target name="test" depends="init build common.run-database-tests" />
 </project>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.