nhibernate-commit — CVS Commits

[Nhibernate-commit] NHibernateContrib/src/NHibernate.Tasks NHibernate.Tasks.build,1.2,1.3

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/NHibernateContrib/src/NHibernate.Tasks
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8405/src/NHibernate.Tasks

Modified Files:
	NHibernate.Tasks.build 
Log Message:
upgraded to nant-0.85-rc3

Index: NHibernate.Tasks.build
===================================================================
RCS file: /cvsroot/nhibernate/NHibernateContrib/src/NHibernate.Tasks/NHibernate.Tasks.build,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NHibernate.Tasks.build	4 Apr 2005 12:35:39 -0000	1.2
--- NHibernate.Tasks.build	25 Apr 2005 03:33:59 -0000	1.3
***************
*** 2,6 ****
  	name="NHibernate.Tasks" 
  	default="build" 
! 	xmlns="http://nant.sf.net/schemas/nant-0.84.win32.net-1.0.xsd"
  >
  	
--- 2,6 ----
  	name="NHibernate.Tasks" 
  	default="build" 
! 	xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd"
  >
  	
***************
*** 22,28 ****
  		<asminfo output="AssemblyInfo.cs" language="CSharp">
  			<imports>
! 				<import name="System" />
! 				<import name="System.Reflection" />
! 				<import name="System.Runtime.CompilerServices" />
  			</imports>
  			<attributes>
--- 22,28 ----
  		<asminfo output="AssemblyInfo.cs" language="CSharp">
  			<imports>
! 				<import namespace="System" />
! 				<import namespace="System.Reflection" />
! 				<import namespace="System.Runtime.CompilerServices" />
  			</imports>
  			<attributes>
***************
*** 46,61 ****
  			debug="${build.debug}"
  			doc="${build.dir}/bin/${nant.project.name}.xml"
- 			nowarn="1591"
  		>
  			<sources failonempty="true">
! 				<includes name="*.cs" />
  			</sources>
  			
  			<references basedir="${build.dir}/bin">
! 				<includes name="System.dll" />
! 				<includes name="DotNetMock.dll" />
! 				<includes name="NHibernate.dll" />
! 				<includes name="NAnt.Core.dll" />
! 				<includes name="log4net.dll" />
  			</references>
  		</csc>
--- 46,63 ----
  			debug="${build.debug}"
  			doc="${build.dir}/bin/${nant.project.name}.xml"
  		>
+ 			<nowarn>
+ 				<warning number="1591" />
+ 			</nowarn>
  			<sources failonempty="true">
! 				<include name="*.cs" />
  			</sources>
  			
  			<references basedir="${build.dir}/bin">
! 				<include name="System.dll" />
! 				<include name="DotNetMock.dll" />
! 				<include name="NHibernate.dll" />
! 				<include name="NAnt.Core.dll" />
! 				<include name="log4net.dll" />
  			</references>
  		</csc>

[Nhibernate-commit] NHibernateContrib/src/NHibernate.Tool.hbm2net NHibernate.Tool.hbm2net.build,1.2,1.3

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/NHibernateContrib/src/NHibernate.Tool.hbm2net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8405/src/NHibernate.Tool.hbm2net

Modified Files:
	NHibernate.Tool.hbm2net.build 
Log Message:
upgraded to nant-0.85-rc3

Index: NHibernate.Tool.hbm2net.build
===================================================================
RCS file: /cvsroot/nhibernate/NHibernateContrib/src/NHibernate.Tool.hbm2net/NHibernate.Tool.hbm2net.build,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NHibernate.Tool.hbm2net.build	4 Apr 2005 12:35:39 -0000	1.2
--- NHibernate.Tool.hbm2net.build	25 Apr 2005 03:33:59 -0000	1.3
***************
*** 4,8 ****
  	name="NHibernate.Tool.hbm2net" 
  	default="build" 
! 	xmlns="http://nant.sf.net/schemas/nant-0.84.win32.net-1.0.xsd"
  >
  
--- 4,8 ----
  	name="NHibernate.Tool.hbm2net" 
  	default="build" 
! 	xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd"
  >
  
***************
*** 24,30 ****
  		<asminfo output="AssemblyInfo.cs" language="CSharp">
  			<imports>
! 				<import name="System" />
! 				<import name="System.Reflection" />
! 				<import name="System.Runtime.CompilerServices" />
  			</imports>
  			<attributes>
--- 24,30 ----
  		<asminfo output="AssemblyInfo.cs" language="CSharp">
  			<imports>
! 				<import namespace="System" />
! 				<import namespace="System.Reflection" />
! 				<import namespace="System.Runtime.CompilerServices" />
  			</imports>
  			<attributes>
***************
*** 53,71 ****
  			output="${build.dir}/bin/${nant.project.name}.exe"
  			doc="${build.dir}/bin/${nant.project.name}.xml"
- 			nowarn="1591,1574,1573,1572,1570,1030,0618,1589,0169"
  		>
! 		
  			<sources>
! 				<includes name="*.cs" />
  			</sources>
  			<resources prefix="NHibernate.Tool.hbm2net" dynamicprefix="true">
! 				<includes name="*.vm" />
  			</resources>
  			<references basedir="${build.dir}/bin">
! 				 <includes name="Iesi.Collections.dll" />
! 				 <includes name="NHibernate.dll" />
! 				 <includes name="Commons.dll" />
! 				 <includes name="NVelocity.dll" />
! 				 <includes name="log4net.dll" />
  			</references>
  		</csc>
--- 53,80 ----
  			output="${build.dir}/bin/${nant.project.name}.exe"
  			doc="${build.dir}/bin/${nant.project.name}.xml"
  		>
! 			<nowarn>
! 				<warning number="1591" />
! 				<warning number="1574" />
! 				<warning number="1573" />
! 				<warning number="1572" />
! 				<warning number="1570" />
! 				<warning number="1030" />
! 				<warning number="0618" />
! 				<warning number="1589" />
! 				<warning number="0169" />
! 			</nowarn>
  			<sources>
! 				<include name="*.cs" />
  			</sources>
  			<resources prefix="NHibernate.Tool.hbm2net" dynamicprefix="true">
! 				<include name="*.vm" />
  			</resources>
  			<references basedir="${build.dir}/bin">
! 				 <include name="Iesi.Collections.dll" />
! 				 <include name="NHibernate.dll" />
! 				 <include name="Commons.dll" />
! 				 <include name="NVelocity.dll" />
! 				 <include name="log4net.dll" />
  			</references>
  		</csc>

[Nhibernate-commit] NHibernateContrib/lib/net/1.1 nunit.framework.xml,NONE,1.1 nunit.framework.dll,1.1,1.2

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/NHibernateContrib/lib/net/1.1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5415

Modified Files:
	nunit.framework.dll 
Added Files:
	nunit.framework.xml 
Log Message:
upgraded to nant-0.85-rc3

Index: nunit.framework.dll
===================================================================
RCS file: /cvsroot/nhibernate/NHibernateContrib/lib/net/1.1/nunit.framework.dll,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsFSo7f1 and /tmp/cvsRI38N4 differ

--- NEW FILE: nunit.framework.xml ---
<?xml version="1.0"?>
<doc>
    <assembly>
        <name>nunit.framework</name>
    </assembly>
    <members>
        <member name="T:NUnit.Framework.Assert">
            <summary>
            A set of Assert methods
            </summary>
        </member>
        <member name="M:NUnit.Framework.Assert.#ctor">
            <summary>
            A private constructor disallows any instances of this object. 
            </summary>
        </member>
        <member name="M:NUnit.Framework.Assert.IsTrue(System.Boolean,System.String,System.Object[])">
            <summary>
            Asserts that a condition is true. If the condition is false the method throws
[...1065 lines suppressed...]
            {}
            </example>
        </member>
        <member name="P:NUnit.Framework.TestFixtureAttribute.Description">
            <summary>
            Descriptive text for this fixture
            </summary>
        </member>
        <member name="T:NUnit.Framework.TestFixtureSetUpAttribute">
            <summary>
            TestFixtureSetUpAttribute
            </summary>
        </member>
        <member name="T:NUnit.Framework.TestFixtureTearDownAttribute">
            <summary>
            TestFixtureTearDownAttribute
            </summary>
        </member>
    </members>
</doc>

[Nhibernate-commit] nhibernate NHibernateSolution.build,1.29,1.30

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5219

Modified Files:
	NHibernateSolution.build 
Log Message:
upgraded to nant-0.85-rc3

Index: NHibernateSolution.build
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/NHibernateSolution.build,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** NHibernateSolution.build	28 Mar 2005 06:37:32 -0000	1.29
--- NHibernateSolution.build	25 Apr 2005 03:26:59 -0000	1.30
***************
*** 4,8 ****
  	name="NHibernateSolution" 
  	default="build"
! 	xmlns="http://nant.sf.net/schemas/nant-0.84.win32.net-1.0.xsd"
  >
  	<!-- 
--- 4,8 ----
  	name="NHibernateSolution" 
  	default="build"
! 	xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd"
  >
  	<!-- 
***************
*** 18,23 ****
  	<property name="clover.src" value="src\CloverSrc" />
  	<property name="clover.db" value="${clover.src}\clover.cdb" />
! 	<property name="clover.home" value="C:/Program Files/Cenqua/Clover.NET" />
! 	
  	<!-- 
  		Use this to determine if the key file NHibernate.key should be used to 
--- 18,23 ----
  	<property name="clover.src" value="src\CloverSrc" />
  	<property name="clover.db" value="${clover.src}\clover.cdb" />
! 	<property name="clover.home" value="C:/Program Files/Cenqua/Clover.NET for Visual Studio" />
! 	<property name="clover.assembly" value="CloverNAnt-0.85.dll" />
  	<!-- 
  		Use this to determine if the key file NHibernate.key should be used to 
***************
*** 126,130 ****
  		<copy todir="${build.dir}/bin">
  			<fileset basedir="lib">
! 				<includes name="HashCodeProvider.*" />
  			</fileset>
  		</copy>
--- 126,130 ----
  		<copy todir="${build.dir}/bin">
  			<fileset basedir="lib">
! 				<include name="HashCodeProvider.*" />
  			</fileset>
  		</copy>
***************
*** 138,148 ****
  					do want to copy the license file.
  				-->
! 				<excludes name="Iesi.Collections.dll" />
! 				<excludes name="Iesi.Collections.xml" />
! 				<includes name="Iesi.Collections.license.txt" />
  				
! 				<includes name="Castle.DynamicProxy.*" />
! 				<includes name="log4net.*" />
! 				<includes name="nunit.framework.*" />
  			</fileset>
  		</copy>
--- 138,148 ----
  					do want to copy the license file.
  				-->
! 				<exclude name="Iesi.Collections.dll" />
! 				<exclude name="Iesi.Collections.xml" />
! 				<include name="Iesi.Collections.license.txt" />
  				
! 				<include name="Castle.DynamicProxy.*" />
! 				<include name="log4net.*" />
! 				<include name="nunit.framework.*" />
  			</fileset>
  		</copy>
***************
*** 192,200 ****
  		/>
  
! 		<if propertytrue="nunit2report.installed">
  			<mkdir dir="${build.dir}/testresults" />
  			<nunit2report out="${build.dir}/testresults/index.html" format="Frames" todir="${build.dir}/testresults">
  				<fileset>
! 					<includes name="${build.dir}\bin\*results.xml" />
  				</fileset>
  			</nunit2report>
--- 192,200 ----
  		/>
  
! 		<if test="${nunit2report.installed}">
  			<mkdir dir="${build.dir}/testresults" />
  			<nunit2report out="${build.dir}/testresults/index.html" format="Frames" todir="${build.dir}/testresults">
  				<fileset>
! 					<include name="${build.dir}\bin\*results.xml" />
  				</fileset>
  			</nunit2report>
***************
*** 213,225 ****
  				
  				<!-- Any hbm.xml and cfg.xml files in the bin are for testing purposes -->
! 				<includes name="*.hbm.xml" />
! 				<includes name="*.cfg.xml" />
  				
  				<!-- The MyTest Assembly was used in the AssemblyOrderer fixtures -->
! 				<includes name="MyTest*.dll" />
! 				<includes name="MyTest*.pdb" />
  				
  				<!-- Go ahead and delete the log file that contains all the sql output-->
! 				<includes name="log.txt" />
  				
  				<!-- 
--- 213,225 ----
  				
  				<!-- Any hbm.xml and cfg.xml files in the bin are for testing purposes -->
! 				<include name="*.hbm.xml" />
! 				<include name="*.cfg.xml" />
  				
  				<!-- The MyTest Assembly was used in the AssemblyOrderer fixtures -->
! 				<include name="MyTest*.dll" />
! 				<include name="MyTest*.pdb" />
  				
  				<!-- Go ahead and delete the log file that contains all the sql output-->
! 				<include name="log.txt" />
  				
  				<!-- 
***************
*** 227,235 ****
  					clean and ready for the downloader to use.	
  				-->
! 				<includes name="Iesi.Collections.Test.*" />
! 				<includes name="NHibernate.DomainModel.*" />
! 				<includes name="NHibernate.Examples.*" />
! 				<includes name="NHibernate.Test.*" />
! 				<includes name="nunit.framework.*" />
  				
  			</fileset>
--- 227,235 ----
  					clean and ready for the downloader to use.	
  				-->
! 				<include name="Iesi.Collections.Test.*" />
! 				<include name="NHibernate.DomainModel.*" />
! 				<include name="NHibernate.Examples.*" />
! 				<include name="NHibernate.Test.*" />
! 				<include name="nunit.framework.*" />
  				
  			</fileset>
***************
*** 238,242 ****
  	
  	<target name="coverage-report" description="Builds the Test Coverage reports">
! 			
  		<mkdir dir="${build.dir}/clover" />
  		<clover-setup 
--- 238,242 ----
  	
  	<target name="coverage-report" description="Builds the Test Coverage reports">
! 		
  		<mkdir dir="${build.dir}/clover" />
  		<clover-setup 
***************
*** 246,250 ****
  		<clover-report>
  			<current title="NHibernate Clover Report" output="${build.dir}/clover" >
! 				<format type="html" orderBy="Alpha" />
  			</current>
  		</clover-report>
--- 246,250 ----
  		<clover-report>
  			<current title="NHibernate Clover Report" output="${build.dir}/clover" >
! 				<format type="html" orderby="Alpha" />
  			</current>
  		</clover-report>

[Nhibernate-commit] nhibernate/src/NHibernate NHibernate.build,1.11,1.12

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5100/src/NHibernate

Modified Files:
	NHibernate.build 
Log Message:
upgraded to nant-0.85-rc3

Index: NHibernate.build
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/NHibernate.build,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** NHibernate.build	21 Apr 2005 06:50:27 -0000	1.11
--- NHibernate.build	25 Apr 2005 03:26:36 -0000	1.12
***************
*** 4,8 ****
  	name="NHibernate" 
  	default="build" 
! 	xmlns="http://nant.sf.net/schemas/nant-0.84.win32.net-1.0.xsd"
  >
  	
--- 4,8 ----
  	name="NHibernate" 
  	default="build" 
! 	xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd"
  >
  	
***************
*** 20,27 ****
  			* clover.src			- location of the clovered source to be stored at from the root of nhibernate
  			* clover.db				- location of the coverage db from the root of nhibernate
  	-->
  	
! 	<if propertytrue="clover.enabled">	
! 		<loadtasks assembly="${clover.home}/CloverNAnt-0.84.dll" />
  	</if>
  	
--- 20,28 ----
  			* clover.src			- location of the clovered source to be stored at from the root of nhibernate
  			* clover.db				- location of the coverage db from the root of nhibernate
+ 			* clover.assembly		- assembly that contains clover tasks for this version of NAnt
  	-->
  	
! 	<if test="${clover.enabled}">	
! 		<loadtasks assembly="${clover.home}/${clover.assembly}" />
  	</if>
  	
***************
*** 30,34 ****
  	<target name="build" description="Build NHibernate">
  		
! 		<if propertytrue="clover.enabled">	
  			<clover-setup 
  				initstring="..\..\${clover.db}"
--- 31,35 ----
  	<target name="build" description="Build NHibernate">
  		
! 		<if test="${clover.enabled}">	
  			<clover-setup 
  				initstring="..\..\${clover.db}"
***************
*** 44,51 ****
  		<asminfo output="AssemblyInfo.cs" language="CSharp">
  			<imports>
! 				<import name="System" />
! 				<import name="System.Reflection" />
! 				<import name="System.Runtime.CompilerServices" />
! 				<import name="System.Runtime.InteropServices" />
  			</imports>
  			<attributes>
--- 45,52 ----
  		<asminfo output="AssemblyInfo.cs" language="CSharp">
  			<imports>
! 				<import namespace="System" />
! 				<import namespace="System.Reflection" />
! 				<import namespace="System.Runtime.CompilerServices" />
! 				<import namespace="System.Runtime.InteropServices" />
  			</imports>
  			<attributes>
***************
*** 70,75 ****
  			output="${build.dir}/bin/${nant.project.name}.dll" 
  			doc="${build.dir}/bin/${nant.project.name}.xml"
- 			nowarn="1573,1591"
  		>
  			<!--
  				Documentation related warnings.  Basically it's not going to output a warning when there
--- 71,79 ----
  			output="${build.dir}/bin/${nant.project.name}.dll" 
  			doc="${build.dir}/bin/${nant.project.name}.xml"
  		>
+ 			<nowarn>
+ 				<warning number="1573" />
+ 				<warning number="1591" />
+ 			</nowarn>
  			<!--
  				Documentation related warnings.  Basically it's not going to output a warning when there
***************
*** 92,116 ****
  			
  			<sources failonempty="true">
! 				<includes name="**/*.cs" />
! 				<excludes name="Dialect/HSQLDialect.cs" />
! 				<excludes name="Dialect/InterbaseDialect.cs" />
! 				<excludes name="Dialect/SAPDBDialect.cs" />
! 				<excludes name="Tool/hbm2net/*.cs" />
  			</sources>
  			
  			<resources prefix="NHibernate" dynamicprefix="true">
! 				<includes name="*.xsd" />
! 				<includes name="**/*.xml" />
! 				<excludes name="bin/**/*.xml" />
  			</resources>
  			
  			<references basedir="${build.dir}/bin">
! 				<includes name="${nant.settings.currentframework.frameworkassemblydirectory}/System.dll" />
! 				<includes name="${nant.settings.currentframework.frameworkassemblydirectory}/System.XML.dll" />
! 				<includes name="${nant.settings.currentframework.frameworkassemblydirectory}/System.Data.dll" />
! 				<includes name="Iesi.Collections.dll" />
! 				<includes name="log4net.dll" />
! 				<includes name="HashCodeProvider.dll" />
! 				<includes name="Castle.DynamicProxy.dll" />
  			</references>
  	
--- 96,120 ----
  			
  			<sources failonempty="true">
! 				<include name="**/*.cs" />
! 				<exclude name="Dialect/HSQLDialect.cs" />
! 				<exclude name="Dialect/InterbaseDialect.cs" />
! 				<exclude name="Dialect/SAPDBDialect.cs" />
! 				<exclude name="Tool/hbm2net/*.cs" />
  			</sources>
  			
  			<resources prefix="NHibernate" dynamicprefix="true">
! 				<include name="*.xsd" />
! 				<include name="**/*.xml" />
! 				<exclude name="bin/**/*.xml" />
  			</resources>
  			
  			<references basedir="${build.dir}/bin">
! 				<include name="${nant.settings.currentframework.frameworkassemblydirectory}/System.dll" />
! 				<include name="${nant.settings.currentframework.frameworkassemblydirectory}/System.XML.dll" />
! 				<include name="${nant.settings.currentframework.frameworkassemblydirectory}/System.Data.dll" />
! 				<include name="Iesi.Collections.dll" />
! 				<include name="log4net.dll" />
! 				<include name="HashCodeProvider.dll" />
! 				<include name="Castle.DynamicProxy.dll" />
  			</references>
  	

[Nhibernate-commit] nhibernate/src/NHibernate.Test NHibernate.Test.build,1.15,1.16

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5100/src/NHibernate.Test

Modified Files:
	NHibernate.Test.build 
Log Message:
upgraded to nant-0.85-rc3

Index: NHibernate.Test.build
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/NHibernate.Test.build,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** NHibernate.Test.build	1 Mar 2005 16:24:41 -0000	1.15
--- NHibernate.Test.build	25 Apr 2005 03:26:37 -0000	1.16
***************
*** 4,8 ****
  	name="NHibernate.Test" 
  	default="build" 
! 	xmlns="http://nant.sf.net/schemas/nant-0.84.win32.net-1.0.xsd"
  >
  	<!--
--- 4,8 ----
  	name="NHibernate.Test" 
  	default="build" 
! 	xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd"
  >
  	<!--
***************
*** 23,28 ****
  		<asminfo output="AssemblyInfo.cs" language="CSharp">
  			<imports>
! 				<import name="System.Reflection" />
! 				<import name="System.Runtime.CompilerServices" />
  			</imports>
  			<attributes>
--- 23,28 ----
  		<asminfo output="AssemblyInfo.cs" language="CSharp">
  			<imports>
! 				<import namespace="System.Reflection" />
! 				<import namespace="System.Runtime.CompilerServices" />
  			</imports>
  			<attributes>
***************
*** 47,67 ****
  		
  			<references basedir="${build.dir}/bin">
! 				<includes name="System.dll" />
! 				<includes name="System.XML.dll" />
! 				<includes name="System.Data.dll" />
! 				<includes name="Iesi.Collections.dll" />
! 				<includes name="log4net.dll" />
! 				<includes name="NHibernate.DomainModel.dll" />
! 				<includes name="NHibernate.dll" />
! 				<includes name="nunit.framework.dll"/>
  			</references>
  			
  			<resources prefix="NHibernate.Test" dynamicprefix="true">
! 				<includes name="**/*.xml" />
! 				<excludes name="bin/**/*.xml" />
  			</resources>
  			
  			<sources>
! 				<includes name="**/*.cs" />
  			</sources>
  		</csc>
--- 47,67 ----
  		
  			<references basedir="${build.dir}/bin">
! 				<include name="System.dll" />
! 				<include name="System.XML.dll" />
! 				<include name="System.Data.dll" />
! 				<include name="Iesi.Collections.dll" />
! 				<include name="log4net.dll" />
! 				<include name="NHibernate.DomainModel.dll" />
! 				<include name="NHibernate.dll" />
! 				<include name="nunit.framework.dll"/>
  			</references>
  			
  			<resources prefix="NHibernate.Test" dynamicprefix="true">
! 				<include name="**/*.xml" />
! 				<exclude name="bin/**/*.xml" />
  			</resources>
  			
  			<sources>
! 				<include name="**/*.cs" />
  			</sources>
  		</csc>

[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel NHibernate.DomainModel.build,1.6,1.7

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5100/src/NHibernate.DomainModel

Modified Files:
	NHibernate.DomainModel.build 
Log Message:
upgraded to nant-0.85-rc3

Index: NHibernate.DomainModel.build
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel.build,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** NHibernate.DomainModel.build	18 Nov 2004 02:45:43 -0000	1.6
--- NHibernate.DomainModel.build	25 Apr 2005 03:26:37 -0000	1.7
***************
*** 4,8 ****
  	name="NHibernate.DomainModel" 
  	default="build" 
! 	xmlns="http://nant.sf.net/schemas/nant-0.84.win32.net-1.0.xsd"
  >
  
--- 4,8 ----
  	name="NHibernate.DomainModel" 
  	default="build" 
! 	xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd"
  >
  
***************
*** 23,28 ****
  		<asminfo output="AssemblyInfo.cs" language="CSharp">
  			<imports>
! 				<import name="System.Reflection" />
! 				<import name="System.Runtime.CompilerServices" />
  			</imports>
  			<attributes>
--- 23,28 ----
  		<asminfo output="AssemblyInfo.cs" language="CSharp">
  			<imports>
! 				<import namespace="System.Reflection" />
! 				<import namespace="System.Runtime.CompilerServices" />
  			</imports>
  			<attributes>
***************
*** 47,64 ****
  		
  			<references basedir="${build.dir}/bin">
! 				<includes name="System.dll" />
! 				<includes name="System.XML.dll" />
! 				<includes name="System.Data.dll" />
! 				<includes name="Iesi.Collections.dll" />
! 				<includes name="NHibernate.dll" />
  			</references>
  			
  			<resources prefix="NHibernate.DomainModel" dynamicprefix="true">
! 				<includes name="**/*.xml" />
! 				<excludes name="bin/**/*.xml" />
  			</resources>
  			
  			<sources failonempty="true">
! 				<includes name="**/*.cs" />
  			</sources>
  		</csc>
--- 47,64 ----
  		
  			<references basedir="${build.dir}/bin">
! 				<include name="System.dll" />
! 				<include name="System.XML.dll" />
! 				<include name="System.Data.dll" />
! 				<include name="Iesi.Collections.dll" />
! 				<include name="NHibernate.dll" />
  			</references>
  			
  			<resources prefix="NHibernate.DomainModel" dynamicprefix="true">
! 				<include name="**/*.xml" />
! 				<exclude name="bin/**/*.xml" />
  			</resources>
  			
  			<sources failonempty="true">
! 				<include name="**/*.cs" />
  			</sources>
  		</csc>

[Nhibernate-commit] nhibernate/src/NHibernate.Examples NHibernate.Examples.build,1.2,1.3

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Examples
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5100/src/NHibernate.Examples

Modified Files:
	NHibernate.Examples.build 
Log Message:
upgraded to nant-0.85-rc3

Index: NHibernate.Examples.build
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Examples/NHibernate.Examples.build,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NHibernate.Examples.build	18 Nov 2004 02:46:10 -0000	1.2
--- NHibernate.Examples.build	25 Apr 2005 03:26:37 -0000	1.3
***************
*** 4,8 ****
  	name="NHibernate.Examples" 
  	default="build" 
! 	xmlns="http://nant.sf.net/schemas/nant-0.84.win32.net-1.0.xsd"
  >
  
--- 4,8 ----
  	name="NHibernate.Examples" 
  	default="build" 
! 	xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd"
  >
  
***************
*** 23,41 ****
  		
  			<references basedir="${build.dir}/bin">
! 				<includes name="System.dll" />
! 				<includes name="System.XML.dll" />
! 				<includes name="System.Data.dll" />
! 				<includes name="Iesi.Collections.dll" />
! 				<includes name="NHibernate.dll" />
! 				<includes name="nunit.framework.dll" />
  			</references>
  			
  			<resources prefix="NHibernate.Examples" dynamicprefix="true">
! 				<includes name="**/*.xml" />
! 				<excludes name="bin/**/*.xml" />
  			</resources>
  			
  			<sources failonempty="true">
! 				<includes name="**/*.cs" />
  			</sources>
  			
--- 23,41 ----
  		
  			<references basedir="${build.dir}/bin">
! 				<include name="System.dll" />
! 				<include name="System.XML.dll" />
! 				<include name="System.Data.dll" />
! 				<include name="Iesi.Collections.dll" />
! 				<include name="NHibernate.dll" />
! 				<include name="nunit.framework.dll" />
  			</references>
  			
  			<resources prefix="NHibernate.Examples" dynamicprefix="true">
! 				<include name="**/*.xml" />
! 				<exclude name="bin/**/*.xml" />
  			</resources>
  			
  			<sources failonempty="true">
! 				<include name="**/*.cs" />
  			</sources>
  			

[Nhibernate-commit] nhibernate/src/Iesi.Collections.Test Iesi.Collections.Test.build,1.1,1.2

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/Iesi.Collections.Test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5100/src/Iesi.Collections.Test

Modified Files:
	Iesi.Collections.Test.build 
Log Message:
upgraded to nant-0.85-rc3

Index: Iesi.Collections.Test.build
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/Iesi.Collections.Test/Iesi.Collections.Test.build,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Iesi.Collections.Test.build	8 Dec 2004 15:22:00 -0000	1.1
--- Iesi.Collections.Test.build	25 Apr 2005 03:26:36 -0000	1.2
***************
*** 4,8 ****
  	name="Iesi.Collections.Test" 
  	default="build" 
! 	xmlns="http://nant.sf.net/schemas/nant-0.84.win32.net-1.0.xsd"
  >
  	<!--
--- 4,8 ----
  	name="Iesi.Collections.Test" 
  	default="build" 
! 	xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd"
  >
  	<!--
***************
*** 23,28 ****
  		<asminfo output="AssemblyInfo.cs" language="CSharp">
  			<imports>
! 				<import name="System.Reflection" />
! 				<import name="System.Runtime.CompilerServices" />
  			</imports>
  			<attributes>
--- 23,28 ----
  		<asminfo output="AssemblyInfo.cs" language="CSharp">
  			<imports>
! 				<import namespace="System.Reflection" />
! 				<import namespace="System.Runtime.CompilerServices" />
  			</imports>
  			<attributes>
***************
*** 47,59 ****
  		
  			<references basedir="${build.dir}/bin">
! 				<includes name="System.dll" />
! 				<includes name="System.XML.dll" />
! 				<includes name="System.Data.dll" />
! 				<includes name="Iesi.Collections.dll" />
! 				<includes name="nunit.framework.dll"/>
  			</references>
  			
  			<sources>
! 				<includes name="**/*.cs" />
  			</sources>
  		</csc>
--- 47,59 ----
  		
  			<references basedir="${build.dir}/bin">
! 				<include name="System.dll" />
! 				<include name="System.XML.dll" />
! 				<include name="System.Data.dll" />
! 				<include name="Iesi.Collections.dll" />
! 				<include name="nunit.framework.dll"/>
  			</references>
  			
  			<sources>
! 				<include name="**/*.cs" />
  			</sources>
  		</csc>

[Nhibernate-commit] nhibernate/src/Iesi.Collections Iesi.Collections.build,1.3,1.4

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/Iesi.Collections
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5100/src/Iesi.Collections

Modified Files:
	Iesi.Collections.build 
Log Message:
upgraded to nant-0.85-rc3

Index: Iesi.Collections.build
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/Iesi.Collections/Iesi.Collections.build,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Iesi.Collections.build	8 Dec 2004 15:21:59 -0000	1.3
--- Iesi.Collections.build	25 Apr 2005 03:26:36 -0000	1.4
***************
*** 4,8 ****
  	name="Iesi.Collections" 
  	default="build" 
! 	xmlns="http://nant.sf.net/schemas/nant-0.84.win32.net-1.0.xsd"
  >
  
--- 4,8 ----
  	name="Iesi.Collections" 
  	default="build" 
! 	xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd"
  >
  
***************
*** 20,27 ****
  			* clover.src			- location of the clovered source to be stored at from the root of nhibernate
  			* clover.db				- location of the coverage db from the root of nhibernate
  	-->
  
! 	<if propertytrue="clover.enabled">	
! 		<loadtasks assembly="${clover.home}/CloverNAnt-0.84.dll" />
  	</if>
  	
--- 20,28 ----
  			* clover.src			- location of the clovered source to be stored at from the root of nhibernate
  			* clover.db				- location of the coverage db from the root of nhibernate
+ 			* clover.assembly		- assembly that contains clover tasks for this version of NAnt
  	-->
  
! 	<if test="${clover.enabled}">	
! 		<loadtasks assembly="${clover.home}/${clover.assembly}" />
  	</if>
  	
***************
*** 30,34 ****
  	<target name="build" description="Build Iesi.Collections">
  		
! 		<if propertytrue="clover.enabled">	
  			<clover-setup 
  				initstring="..\..\${clover.db}"
--- 31,35 ----
  	<target name="build" description="Build Iesi.Collections">
  		
! 		<if test="${clover.enabled}">	
  			<clover-setup 
  				initstring="..\..\${clover.db}"
***************
*** 44,50 ****
  		<asminfo output="AssemblyInfo.cs" language="CSharp">
  			<imports>
! 				<import name="System" />
! 				<import name="System.Reflection" />
! 				<import name="System.Runtime.CompilerServices" />
  			</imports>
  			<attributes>
--- 45,51 ----
  		<asminfo output="AssemblyInfo.cs" language="CSharp">
  			<imports>
! 				<import namespace="System" />
! 				<import namespace="System.Reflection" />
! 				<import namespace="System.Runtime.CompilerServices" />
  			</imports>
  			<attributes>
***************
*** 71,82 ****
  			
  			<sources failonempty="true">
! 				<includes name="**/*.cs" />
  			</sources>
  			
  			
  			<references basedir="${build.dir}/bin">
! 				<includes name="${nant.settings.currentframework.frameworkassemblydirectory}/System.dll" />
! 				<includes name="${nant.settings.currentframework.frameworkassemblydirectory}/System.XML.dll" />
! 				<includes name="${nant.settings.currentframework.frameworkassemblydirectory}/System.Data.dll" />
  			</references>
  	
--- 72,83 ----
  			
  			<sources failonempty="true">
! 				<include name="**/*.cs" />
  			</sources>
  			
  			
  			<references basedir="${build.dir}/bin">
! 				<include name="${nant.settings.currentframework.frameworkassemblydirectory}/System.dll" />
! 				<include name="${nant.settings.currentframework.frameworkassemblydirectory}/System.XML.dll" />
! 				<include name="${nant.settings.currentframework.frameworkassemblydirectory}/System.Data.dll" />
  			</references>
  	

[Nhibernate-commit] nhibernate/lib/net/1.1 nunit.framework.xml,NONE,1.1 nunit.framework.dll,1.1,1.2

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/lib/net/1.1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3849

Modified Files:
	nunit.framework.dll 
Added Files:
	nunit.framework.xml 
Log Message:
upgraded to nant-0.85-rc3

Index: nunit.framework.dll
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/lib/net/1.1/nunit.framework.dll,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsXFLWBz and /tmp/cvsPIPw2o differ

--- NEW FILE: nunit.framework.xml ---
<?xml version="1.0"?>
<doc>
    <assembly>
        <name>nunit.framework</name>
    </assembly>
    <members>
        <member name="T:NUnit.Framework.Assert">
            <summary>
            A set of Assert methods
            </summary>
        </member>
        <member name="M:NUnit.Framework.Assert.#ctor">
            <summary>
            A private constructor disallows any instances of this object. 
            </summary>
        </member>
        <member name="M:NUnit.Framework.Assert.IsTrue(System.Boolean,System.String,System.Object[])">
            <summary>
            Asserts that a condition is true. If the condition is false the method throws
[...1065 lines suppressed...]
            {}
            </example>
        </member>
        <member name="P:NUnit.Framework.TestFixtureAttribute.Description">
            <summary>
            Descriptive text for this fixture
            </summary>
        </member>
        <member name="T:NUnit.Framework.TestFixtureSetUpAttribute">
            <summary>
            TestFixtureSetUpAttribute
            </summary>
        </member>
        <member name="T:NUnit.Framework.TestFixtureTearDownAttribute">
            <summary>
            TestFixtureTearDownAttribute
            </summary>
        </member>
    </members>
</doc>

[Nhibernate-commit] nhibernate/src/NHibernate.Test FooBarTest.cs,1.91,1.92

[Sergey K. <jus...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31965/src/NHibernate.Test

Modified Files:
	FooBarTest.cs 
Log Message:
Integrated two more tests from H2.1, fixed uncovered bugs.

Index: FooBarTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/FooBarTest.cs,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** FooBarTest.cs	17 Apr 2005 17:16:04 -0000	1.91
--- FooBarTest.cs	24 Apr 2005 19:37:56 -0000	1.92
***************
*** 81,86 ****
  		}
  
  		[Test]
- 		[Ignore("Test not complete yet.")]
  		public void Query() 
  		{
--- 81,107 ----
  		}
  
+ 		private static bool IsEmpty( IEnumerable enumerable )
+ 		{
+ 			return !enumerable.GetEnumerator().MoveNext();
+ 		}
+ 
+ 		private static bool ContainsSingleObject( IEnumerable enumerable, object obj )
+ 		{
+ 			IEnumerator enumerator = enumerable.GetEnumerator();
+ 			
+ 			// Fail if no items
+ 			if( !enumerator.MoveNext() ) return false;
+ 			
+ 			// Fail if item not equal
+ 			if( !object.Equals( obj, enumerator.Current ) ) return false;
+ 
+ 			// Fail if more items
+ 			if( enumerator.MoveNext() ) return false;
+ 
+ 			// Succeed
+ 			return true;
+ 		}
+ 
  		[Test]
  		public void Query() 
  		{
***************
*** 109,116 ****
  			s.Find( "select foo.TheFoo.TheFoo.TheFoo.String from foo in class Foo where foo.TheFoo.TheFoo = 'bar'" );
  			s.Find( "select foo.TheFoo.TheFoo.String from foo in class Foo where foo.TheFoo.TheFoo.TheFoo.String = 'bar'" );
! 			//			if( !( dialect is Dialect.HSQLDialect ) ) 
! 			//			{
  			s.Find( "select foo.String from foo in class Foo where foo.TheFoo.TheFoo.TheFoo = foo.TheFoo.TheFoo" );
! 			//			}
  			s.Find( "select foo.String from foo in class Foo where foo.TheFoo.TheFoo = 'bar' and foo.TheFoo.TheFoo.TheFoo = 'baz'" );
  			s.Find( "select foo.String from foo in class Foo where foo.TheFoo.TheFoo.TheFoo.String = 'a' and foo.TheFoo.String = 'b'" );
--- 130,137 ----
  			s.Find( "select foo.TheFoo.TheFoo.TheFoo.String from foo in class Foo where foo.TheFoo.TheFoo = 'bar'" );
  			s.Find( "select foo.TheFoo.TheFoo.String from foo in class Foo where foo.TheFoo.TheFoo.TheFoo.String = 'bar'" );
! //			if( !( dialect is Dialect.HSQLDialect ) ) 
! //			{
  			s.Find( "select foo.String from foo in class Foo where foo.TheFoo.TheFoo.TheFoo = foo.TheFoo.TheFoo" );
! //			}
  			s.Find( "select foo.String from foo in class Foo where foo.TheFoo.TheFoo = 'bar' and foo.TheFoo.TheFoo.TheFoo = 'baz'" );
  			s.Find( "select foo.String from foo in class Foo where foo.TheFoo.TheFoo.TheFoo.String = 'a' and foo.TheFoo.String = 'b'" );
***************
*** 147,155 ****
  			s.Find( "from Baz baz left join baz.FooToGlarch join fetch baz.FooSet foo left join fetch foo.TheFoo" );
  
! 			// foo.Boolean = true
! 			list = s.Find( "from foo in class NHibernate.DomainModel.Foo where foo.String='osama bin laden' and foo.Boolean = 1 order by foo.String asc, foo.Component.Count desc" );
  			Assert.AreEqual( 0, list.Count, "empty query" );
! 			IEnumerable enumer = s.Enumerable( "from foo in class NHibernate.DomainModel.Foo where foo.String='osama bin laden' order by foo.String asc, foo.Component.Count desc" );
! 			Assert.IsFalse( enumer.GetEnumerator().MoveNext(), "empty enumerator" );
  
  			list = s.Find( "select foo.TheFoo from foo in class NHibernate.DomainModel.Foo" );
--- 168,175 ----
  			s.Find( "from Baz baz left join baz.FooToGlarch join fetch baz.FooSet foo left join fetch foo.TheFoo" );
  
! 			list = s.Find( "from foo in class NHibernate.DomainModel.Foo where foo.String='osama bin laden' and foo.Boolean = true order by foo.String asc, foo.Component.Count desc" );
  			Assert.AreEqual( 0, list.Count, "empty query" );
! 			IEnumerable enumerable = s.Enumerable( "from foo in class NHibernate.DomainModel.Foo where foo.String='osama bin laden' order by foo.String asc, foo.Component.Count desc" );
! 			Assert.IsTrue( IsEmpty( enumerable ), "empty enumerator" );
  
  			list = s.Find( "select foo.TheFoo from foo in class NHibernate.DomainModel.Foo" );
***************
*** 166,189 ****
  				list = s.Find( "from foo in class NHibernate.DomainModel.Foo where ? = some foo.Component.ImportantDates.elements", new DateTime( DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day ), NHibernateUtil.DateTime );
  				Assert.AreEqual( 2, list.Count, "componenet query" );
  			}
  
! 			// WAS: 3 in h2.0.3 - there's a null value at index 2 that is not in the db with hibernate - it is a missing index
! 			// in the db
! 			list = s.Find( "from foo in class NHibernate.DomainModel.Foo where size(foo.Component.ImportantDates) = 4" ); 
! 			Assert.AreEqual( 2, list.Count, "component query" );
! 			list = s.Find( "from foo in class Foo where 0 = size(foo.Component.ImportantDates)" );
  			Assert.AreEqual( 0, list.Count, "component query" );
! 			list = s.Find( "from foo in class Foo where exists elements(foo.Component.ImportantDates)" );
  			Assert.AreEqual( 2, list.Count, "component query" );
! 			s.Find( "from foo in class Foo where not exists (from bar in class Bar where bar.id = foo.id)" );
  
! 			s.Find( "select foo.TheFoo from foo in class Foo where foo = some(select x from x in class Foo where x.Long > foo.TheFoo.Long)" );
! 			s.Find( "from foo in class Foo where foo = some(select x from x in class Foo where x.Long > foo.TheFoo.Long) and foo.TheFoo.String='baz'" );
! 			s.Find( "from foo in class Foo where foo.TheFoo.String='baz' and foo = some(select x from x in class Foo where x.Long>foo.TheFoo.Long)" );
! 			s.Find( "from foo in class Foo where foo = some(select x from x in class Foo where x.Long > foo.TheFoo.Long)" );
  
! 			s.Enumerable( "select foo.String, foo.Date, foo.TheFoo.String, foo.id from foo in class Foo, baz in class Baz where foo in elements(baz.FooArray) and foo.String like 'foo'" );
  		}
- 		// line 1645
  
  		[Test]
--- 186,503 ----
  				list = s.Find( "from foo in class NHibernate.DomainModel.Foo where ? = some foo.Component.ImportantDates.elements", new DateTime( DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day ), NHibernateUtil.DateTime );
  				Assert.AreEqual( 2, list.Count, "componenet query" );
+ 
+ 				list = s.Find( "from foo in class NHibernate.DomainModel.Foo where size(foo.Component.ImportantDates) = 3" ); 
+ 				Assert.AreEqual( 2, list.Count, "component query" );
+ 				list = s.Find( "from foo in class Foo where 0 = size(foo.Component.ImportantDates)" );
+ 				Assert.AreEqual( 0, list.Count, "component query" );
+ 				list = s.Find( "from foo in class Foo where exists elements(foo.Component.ImportantDates)" );
+ 				Assert.AreEqual( 2, list.Count, "component query" );
+ 				s.Find( "from foo in class Foo where not exists (from bar in class Bar where bar.id = foo.id)" );
+ 
+ 				s.Find( "select foo.TheFoo from foo in class Foo where foo = some(select x from x in class Foo where x.Long > foo.TheFoo.Long)" );
+ 				s.Find( "from foo in class Foo where foo = some(select x from x in class Foo where x.Long > foo.TheFoo.Long) and foo.TheFoo.String='baz'" );
+ 				s.Find( "from foo in class Foo where foo.TheFoo.String='baz' and foo = some(select x from x in class Foo where x.Long>foo.TheFoo.Long)" );
+ 				s.Find( "from foo in class Foo where foo = some(select x from x in class Foo where x.Long > foo.TheFoo.Long)" );
+ 
+ 				s.Enumerable( "select foo.String, foo.Date, foo.TheFoo.String, foo.id from foo in class Foo, baz in class Baz where foo in elements(baz.FooArray) and foo.String like 'foo'" );
  			}
  
! 			list = s.Find( "from foo in class Foo where foo.Component.Count is null order by foo.Component.Count" );
  			Assert.AreEqual( 0, list.Count, "component query" );
! 			
! 			list = s.Find( "from foo in class Foo where foo.Component.Name='foo'" );
  			Assert.AreEqual( 2, list.Count, "component query" );
! 			
! 			list = s.Find( "select distinct foo.Component.Name, foo.Component.Name from foo in class Foo where foo.Component.Name='foo'" );
! 			Assert.AreEqual( 1, list.Count, "component query" );
  
! 			list = s.Find( "select distinct foo.Component.Name, foo.id from foo in class Foo where foo.Component.Name='foo'" );
! 			Assert.AreEqual( 2, list.Count, "component query" );
  
! 			list = s.Find( "select foo.TheFoo from foo in class Foo" );
! 			Assert.AreEqual( 2, list.Count, "query" );
! 
! 			list = s.Find( "from foo in class Foo where foo.id=?", foo.Key, NHibernateUtil.String );
! 			Assert.AreEqual( 1, list.Count, "id query" );
! 
! 			list = s.Find("from foo in class Foo where foo.Key=?", foo.Key, NHibernateUtil.String );
! 			Assert.AreEqual( 1, list.Count, "named id query" );
! 			Assert.AreSame( foo, list[0], "id query" );
! 
! 			list = s.Find("select foo.TheFoo from foo in class Foo where foo.String='fizard'");
! 			Assert.AreEqual( 1, list.Count, "query" );
! 			Assert.AreSame( foo.TheFoo, list[0], "returned object" );
! 			
! 			list = s.Find("from foo in class Foo where foo.Component.Subcomponent.Name='bar'");
! 			Assert.AreEqual( 2, list.Count, "components of components" );
! 			
! 			list = s.Find("select foo.TheFoo from foo in class Foo where foo.TheFoo.id=?",
! 				foo.TheFoo.Key, NHibernateUtil.String);
! 			Assert.AreEqual( 1, list.Count, "by id query" );
! 			Assert.AreSame( foo.TheFoo, list[0], "by id returned object" );
! 
! 			s.Find( "from foo in class Foo where foo.TheFoo = ?", foo.TheFoo, NHibernateUtil.Entity( typeof( Foo ) ) );
! 
! 			Assert.IsTrue( IsEmpty( s.Enumerable("from bar in class Bar where bar.String='a string' or bar.String='a string'")
! 				) );
! 
! 			enumerable = s.Enumerable(
! 				"select foo.Component.Name, foo.Component.ImportantDates.elements from foo in class Foo where foo.TheFoo.id=?",
! 				foo.TheFoo.Key, NHibernateUtil.String
! 			);
! 			int i=0;
! 			foreach( object[] row in enumerable )
! 			{
! 				i++;
! 				Assert.IsTrue( row[0] is String );
! 				Assert.IsTrue( row[1] == null || row[1] is DateTime );
! 			}
! 			Assert.AreEqual( 3, i ); //WAS: 4
! 
! 			enumerable = s.Enumerable(
! 				"select max(foo.Component.ImportantDates.elements) from foo in class Foo group by foo.id"
! 			);
! 			IEnumerator enumerator = enumerable.GetEnumerator();
! 			
! 			Assert.IsTrue( enumerator.MoveNext() );
! 			Assert.IsTrue( enumerator.Current is DateTime );
! 
! 			list = s.Find(
! 				"select foo.TheFoo.TheFoo.TheFoo from foo in class Foo, foo2 in class Foo where"
! 				+ " foo = foo2.TheFoo and not not ( not foo.String='fizard' )"
! 				+ " and foo2.String between 'a' and (foo.TheFoo.String)"
! 				+ //( dialect is HSQLDialect || dialect is InterbaseDialect )?
! 				  //" and ( foo2.String in ( 'fiz', 'blah') or 1=1 )"
! 				  //:
! 					" and ( foo2.String in ( 'fiz', 'blah', foo.TheFoo.String, foo.String, foo2.String ) )"
! 				);
! 			Assert.AreEqual( 1, list.Count, "complex query" );
! 			Assert.AreSame( foo, list[0], "returned object" );
! 
! 			foo.String = "from BoogieDown  -tinsel town  =!@#$^&*())";
! 
! 			list = s.Find("from foo in class Foo where foo.String='from BoogieDown  -tinsel town  =!@#$^&*())'");
! 			Assert.AreEqual( 1, list.Count, "single quotes" );
! 
! 			list = s.Find("from foo in class Foo where not foo.String='foo''bar'");
! 			Assert.AreEqual( 2, list.Count, "single quotes" );
! 
! 			list = s.Find("from foo in class Foo where foo.Component.Glarch.Next is null");
! 			Assert.AreEqual( 2, list.Count, "query association in component" );
! 
! 			Bar bar = new Bar();
! 			Baz baz = new Baz();
! 			baz.SetDefaults();
! 			bar.Baz = baz;
! 			baz.ManyToAny = new ArrayList();
! 			baz.ManyToAny.Add( bar );
! 			baz.ManyToAny.Add( foo );
! 			s.Save(bar);
! 			s.Save(baz);
! 			list = s.Find(" from bar in class Bar where bar.Baz.Count=667 and bar.Baz.Count!=123 and not bar.Baz.Name='1-E-1'");
! 			Assert.AreEqual( 1, list.Count, "query many-to-one" );
! 			list = s.Find(" from i in class Bar where i.Baz.Name='Bazza'");
! 			Assert.AreEqual( 1, list.Count, "query many-to-one" );
! 
! 			enumerable = s.Enumerable("select count(distinct foo.TheFoo) from foo in class Foo");
! 			Assert.IsTrue( ContainsSingleObject( enumerable, 2 ), "count" );
! 
! 			enumerable = s.Enumerable("select count(foo.TheFoo.Boolean) from foo in class Foo");
! 			Assert.IsTrue( ContainsSingleObject( enumerable, 2 ), "count" );
! 			
! 			enumerable = s.Enumerable("select count(*), foo.Int from foo in class Foo group by foo.Int");
! 			enumerator = enumerable.GetEnumerator();
! 			Assert.IsTrue( enumerator.MoveNext() );
! 			Assert.AreEqual( 3, (int) ((object[]) enumerator.Current)[0] );
! 			Assert.IsFalse( enumerator.MoveNext() );
! 			
! 			enumerable = s.Enumerable("select sum(foo.TheFoo.Int) from foo in class Foo");
! 			Assert.IsTrue( ContainsSingleObject( enumerable, 4 ), "sum" );
! 
! 			enumerable = s.Enumerable("select count(foo) from foo in class Foo where foo.id=?",
! 				foo.Key, NHibernateUtil.String);
! 			Assert.IsTrue( ContainsSingleObject( enumerable, 1 ), "id query count" );
! 
! 			list = s.Find( "from foo in class Foo where foo.Boolean = ?",
! 				true, NHibernateUtil.Boolean );
! 
! 			list = s.Find("select new Foo(fo.X) from Fo fo");
! 			list = s.Find("select new Foo(fo.Integer) from Foo fo");
! 
! 			list = s.CreateQuery("select new Foo(fo.X) from Foo fo")
! 				// TODO: .SetCacheable(true)
! 				.List();
! 			Assert.IsTrue(list.Count==3);
! 			list = s.CreateQuery("select new Foo(fo.X) from Foo fo")
! 				// TODO: .SetCacheable(true)
! 				.List();
! 			Assert.IsTrue(list.Count==3);
! 
! 			enumerable = s.Enumerable("select new Foo(fo.X) from Foo fo");
! 			enumerator = enumerable.GetEnumerator();
! 			Assert.IsTrue( enumerator.MoveNext(), "projection iterate (results)" );
! 			Assert.IsTrue( typeof(Foo).IsAssignableFrom( enumerator.Current.GetType() ),
! 				"projection iterate (return check)" );
! 
! 			// TODO: ScrollableResults not implemented
! 			//ScrollableResults sr = s.CreateQuery("select new Foo(fo.x) from Foo fo").Scroll();
! 			//Assert.IsTrue( "projection scroll (results)", sr.next() );
! 			//Assert.IsTrue( "projection scroll (return check)", typeof(Foo).isAssignableFrom( sr.get(0).getClass() ) );
! 
! 			list = s.Find("select foo.Long, foo.Component.Name, foo, foo.TheFoo from foo in class Foo");
! 			Assert.IsTrue( list.Count > 0 );
! 			foreach( object[] row in list )
! 			{
! 				Assert.IsTrue( row[0] is long );
! 				Assert.IsTrue( row[1] is string );
! 				Assert.IsTrue( row[2] is Foo );
! 				Assert.IsTrue( row[3] is Foo );
! 			}
! 
! 			list = s.Find("select avg(foo.Float), max(foo.Component.Name), count(distinct foo.id) from foo in class Foo");
! 			Assert.IsTrue( list.Count > 0 );
! 			foreach( object[] row in list )
! 			{
! 				Assert.IsTrue( row[0] is float );
! 				Assert.IsTrue( row[1] is string );
! 				Assert.IsTrue( row[2] is int );
! 			}
! 
! 			list = s.Find("select foo.Long, foo.Component, foo, foo.TheFoo from foo in class Foo");
! 			Assert.IsTrue( list.Count > 0 );
! 			foreach( object[] row in list )
! 			{
! 				Assert.IsTrue( row[0] is long );
! 				Assert.IsTrue( row[1] is FooComponent );
! 				Assert.IsTrue( row[2] is Foo );
! 				Assert.IsTrue( row[3] is Foo );
! 			}
! 
! 			s.Save( new Holder("ice T") );
! 			s.Save( new Holder("ice cube") );
! 
! 			Assert.IsTrue( s.Find("from o in class System.Object").Count==15 );
! 			System.Console.WriteLine( s.Find("from n in class INamed") );
! 			Assert.AreEqual( 7, s.Find("from n in class INamed").Count );
! 			Assert.IsTrue( s.Find("from n in class INamed where n.Name is not null").Count==4 );
! 
! 			foreach( INamed named in s.Enumerable("from n in class INamed") )
! 			{
! 				Assert.IsNotNull( named );
! 			}
! 
! 			s.Save( new Holder("bar") );
! 			enumerable = s.Enumerable("from n0 in class INamed, n1 in class INamed where n0.Name = n1.Name");
! 			int cnt = 0;
! 			foreach( object[] row in enumerable )
! 			{
! 				if ( row[0] != row[1] ) cnt++;
! 			}
! 
! 			//if ( !(dialect is Dialect.HSQLDialect) )
! 			//{
! 				Assert.IsTrue(cnt==2);
! 				Assert.IsTrue( s.Find("from n0 in class INamed, n1 in class INamed where n0.Name = n1.Name").Count==7 );
! 			//}
! 
! 			IQuery qu = s.CreateQuery("from n in class INamed where n.Name = :name");
! 			object temp = qu.ReturnTypes;
! 			temp = qu.NamedParameters;
! 
! 			int c = 0;
! 
! 			foreach( object obj in s.Enumerable("from o in class System.Object") )
! 			{
! 				c++;
! 			}
! 			Assert.IsTrue(c==16);
! 
! 			s.Enumerable("select baz.Code, min(baz.Count) from baz in class Baz group by baz.Code");
! 
! 			Assert.IsTrue( IsEmpty( s.Enumerable( "selecT baz from baz in class Baz where baz.StringDateMap['foo'] is not null or baz.StringDateMap['bar'] = ?",
! 				new DateTime(), NHibernateUtil.Date ) ) );
! 
! 			list = s.Find("select baz from baz in class Baz where baz.StringDateMap['now'] is not null");
! 			Assert.AreEqual( 1, list.Count );
! 			
! 			list = s.Find("select baz from baz in class Baz where baz.StringDateMap['now'] is not null and baz.StringDateMap['big bang'] < baz.StringDateMap['now']");
! 			Assert.AreEqual( 1, list.Count );
! 			
! 			list = s.Find("select index(date) from Baz baz join baz.StringDateMap date");
! 			System.Console.WriteLine(list);
! 			Assert.AreEqual( 2, list.Count );
! 
! 			s.Find("from foo in class Foo where foo.Integer not between 1 and 5 and foo.String not in ('cde', 'abc') and foo.String is not null and foo.Integer<=3");
! 
! 			s.Find("from Baz baz inner join baz.CollectionComponent.Nested.Foos foo where foo.String is null");
! 			if ( !(dialect is Dialect.MySQLDialect)
! 				//&& !(dialect is MckoiDialect)
! 				//&& !(dialect is SAPDBDialect)
! 				//&& !(dialect is PointbaseDialect)
! 				//&& !(dialect is Oracle9Dialect)
! 				)  {
! 				s.Find("from Baz baz inner join baz.FooSet where '1' in (from baz.FooSet foo where foo.String is not null)");
! 				s.Find("from Baz baz where 'a' in elements(baz.CollectionComponent.Nested.Foos) and 1.0 in elements(baz.CollectionComponent.Nested.Floats)");
! 				s.Find("from Baz baz where 'b' in baz.CollectionComponent.Nested.Foos.elements and 1.0 in baz.CollectionComponent.Nested.Floats.elements");
! 			}
! 
! 			s.Find("from Foo foo join foo.TheFoo where foo.TheFoo in ('1','2','3')");
! 
! 			//if ( !(dialect is Dialect.HSQLDialect) )
! 			s.Find("from Foo foo left join foo.TheFoo where foo.TheFoo in ('1','2','3')");
! 			s.Find("select foo.TheFoo from Foo foo where foo.TheFoo in ('1','2','3')");
! 			s.Find("select foo.TheFoo.String from Foo foo where foo.TheFoo in ('1','2','3')");
! 			s.Find("select foo.TheFoo.String from Foo foo where foo.TheFoo.String in ('1','2','3')");
! 			s.Find("select foo.TheFoo.Long from Foo foo where foo.TheFoo.String in ('1','2','3')");
! 			s.Find("select count(*) from Foo foo where foo.TheFoo.String in ('1','2','3') or foo.TheFoo.Long in (1,2,3)");
! 			s.Find("select count(*) from Foo foo where foo.TheFoo.String in ('1','2','3') group by foo.TheFoo.Long");
! 
! 			s.Find("from Foo foo1 left join foo1.TheFoo foo2 left join foo2.TheFoo where foo1.String is not null");
! 			s.Find("from Foo foo1 left join foo1.TheFoo.TheFoo where foo1.String is not null");
! 			s.Find("from Foo foo1 left join foo1.TheFoo foo2 left join foo1.TheFoo.TheFoo foo3 where foo1.String is not null");
! 
! 			s.Find("select foo.Formula from Foo foo where foo.Formula > 0");
! 
! 			int len = s.Find("from Foo as foo join foo.TheFoo as foo2 where foo2.id >'a' or foo2.id <'a'").Count;
! 			Assert.IsTrue(len==2);
! 
! 			s.Delete("from Holder");
! 			s.Flush();
! 			//s.connection().commit();
! 			s.Close();
! 
! 			s = sessions.OpenSession();
! 			baz = (Baz) s.CreateQuery("from Baz baz left outer join fetch baz.ManyToAny").UniqueResult();
! 			Assert.IsTrue( NHibernateUtil.IsInitialized( baz.ManyToAny ) );
! 			Assert.IsTrue( baz.ManyToAny.Count == 2 );
! 			BarProxy barp = (BarProxy) baz.ManyToAny[0];
! 			s.Find("from Baz baz join baz.ManyToAny");
! 			Assert.IsTrue( s.Find("select baz from Baz baz join baz.ManyToAny a where index(a) = 0").Count==1 );
! 
! 			FooProxy foop = (FooProxy) s.Get( typeof(Foo), foo.Key );
! 			Assert.IsTrue( foop == baz.ManyToAny[1] );
! 
! 			barp.Baz = baz;
! 			Assert.IsTrue( s.Find("select bar from Bar bar where bar.Baz.StringDateMap['now'] is not null").Count==1 );
! 			Assert.IsTrue( s.Find("select bar from Bar bar join bar.Baz b where b.StringDateMap['big bang'] < b.StringDateMap['now'] and b.StringDateMap['now'] is not null").Count==1 );
! 			Assert.IsTrue( s.Find("select bar from Bar bar where bar.Baz.StringDateMap['big bang'] < bar.Baz.StringDateMap['now'] and bar.Baz.StringDateMap['now'] is not null").Count==1 );
! 
! 			list = s.Find("select foo.String, foo.Component, foo.id from Bar foo");
! 			Assert.IsTrue ( ( (FooComponent) ( (object[]) list[0] )[1] ).Name == "foo" );
! 			list = s.Find("select elements(baz.Components) from Baz baz");
! 			Assert.IsTrue( list.Count==2 );
! 			list = s.Find("select bc.Name from Baz baz join baz.Components bc");
! 			Assert.IsTrue( list.Count==2 );
! 			//list = s.Find("select bc from Baz baz join baz.components bc");
! 
! 			s.CreateQuery("from Foo foo where foo.Integer < 10 order by foo.String").SetMaxResults(12).List();
! 
! 			s.Delete( barp );
! 			s.Delete( baz );
! 			s.Delete( foop.TheFoo );
! 			s.Delete( foop );
! 			s.Flush();
! 			s.Close();
  		}
  
  		[Test]
***************
*** 280,289 ****
  			}
  		}
- 
  	
  		[Test]
- 		[Ignore("Test not written yet.")]
  		public void QueryCollectionOfValues()
  		{
  		}
  
--- 594,653 ----
  			}
  		}
  	
  		[Test]
  		public void QueryCollectionOfValues()
  		{
+ 			object gid;
+ 
+ 			using( ISession s = sessions.OpenSession() )
+ 			{
+ 				Baz baz = new Baz();
+ 				baz.SetDefaults();
+ 				s.Save(baz);
+ 				Glarch g = new Glarch();
+ 				gid = s.Save(g);
+ 
+ 				if (     !(dialect is Dialect.MySQLDialect)
+ 					//&& !(dialect is Dialect.HSQLDialect)
+ 					//&& !(dialect is Dialect.MckoiDialect)
+ 					//&& !(dialect is Dialect.SAPDBDialect)
+ 					//&& !(dialect is Dialect.PointbaseDialect)
+ 					)
+ 				{
+ 					s.Filter( baz.FooArray, "where size(this.Bytes) > 0");
+ 					s.Filter( baz.FooArray, "where 0 in elements(this.Bytes)");
+ 				}
+ 				s.Flush();
+ 			}
+ 
+ 			using( ISession s = sessions.OpenSession() )
+ 			{
+ 				//s.Find("from Baz baz where baz.FooSet.String = 'foo'");
+ 				//s.Find("from Baz baz where baz.FooArray.String = 'foo'");
+ 				//s.Find("from Baz baz where baz.FooSet.foo.String = 'foo'");
+ 				//s.Find("from Baz baz join baz.FooSet.Foo foo where foo.String = 'foo'");
+ 				s.Find("from Baz baz join baz.FooSet foo join foo.TheFoo.TheFoo foo2 where foo2.String = 'foo'");
+ 				s.Find("from Baz baz join baz.FooArray foo join foo.TheFoo.TheFoo foo2 where foo2.String = 'foo'");
+ 				s.Find("from Baz baz join baz.StringDateMap date where index(date) = 'foo'");
+ 				s.Find("from Baz baz join baz.TopGlarchez g where index(g) = 'A'");
+ 				s.Find("select index(g) from Baz baz join baz.TopGlarchez g");
+ 
+ 				Assert.AreEqual( 3, s.Find("from Baz baz left join baz.StringSet").Count );
+ 				Baz baz = (Baz) s.Find("from Baz baz join baz.StringSet str where str='foo'")[0];
+ 				Assert.IsFalse( NHibernateUtil.IsInitialized( baz.StringSet ) );
+ 				baz = (Baz) s.Find("from Baz baz left join fetch baz.StringSet")[0];
+ 				Assert.IsTrue( NHibernateUtil.IsInitialized( baz.StringSet ) );
+ 				Assert.AreEqual( 1, s.Find("from Baz baz join baz.StringSet string where string='foo'").Count );
+ 				Assert.AreEqual( 1, s.Find("from Baz baz inner join baz.Components comp where comp.Name='foo'").Count );
+ 				//IList bss = s.Find("select baz, ss from Baz baz inner join baz.StringSet ss");
+ 				s.Find("from Glarch g inner join g.FooComponents comp where comp.Fee is not null");
+ 				s.Find("from Glarch g inner join g.FooComponents comp join comp.Fee fee where fee.Count > 0");
+ 				s.Find("from Glarch g inner join g.FooComponents comp where comp.Fee.Count is not null");
+ 
+ 				s.Delete(baz);
+ 				//s.delete("from Glarch g");
+ 				s.Delete( s.Get(typeof( Glarch ), gid) );
+ 				s.Flush();
+ 			}
  		}
  

[Nhibernate-commit] nhibernate/src/NHibernate/Hql PreprocessingParser.cs,1.6,1.7 QueryTranslator.cs,1.57,1.58

[Sergey K. <jus...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31965/src/NHibernate/Hql

Modified Files:
	PreprocessingParser.cs QueryTranslator.cs 
Log Message:
Integrated two more tests from H2.1, fixed uncovered bugs.

Index: PreprocessingParser.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/PreprocessingParser.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PreprocessingParser.cs	31 Dec 2004 18:22:33 -0000	1.6
--- PreprocessingParser.cs	24 Apr 2005 19:37:57 -0000	1.7
***************
*** 40,43 ****
--- 40,45 ----
  			collectionProps.Add( "maxelement", "maxElement" );
  			collectionProps.Add( "minelement", "minElement" );
+ 
+ 			collectionProps.Add( "index", "index" );
  		}
  

Index: QueryTranslator.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/QueryTranslator.cs,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** QueryTranslator.cs	14 Mar 2005 22:41:15 -0000	1.57
--- QueryTranslator.cs	24 Apr 2005 19:37:57 -0000	1.58
***************
*** 38,42 ****
  		private IList whereTokens = new ArrayList(); // contains a List of strings containing Sql or SqlStrings
  		private IList havingTokens = new ArrayList();
! 		private IDictionary joins = new Hashtable();
  		private IList orderByTokens = new ArrayList();
  		private IList groupByTokens = new ArrayList();
--- 38,42 ----
  		private IList whereTokens = new ArrayList(); // contains a List of strings containing Sql or SqlStrings
  		private IList havingTokens = new ArrayList();
! 		private IDictionary joins = new SequencedHashMap();
  		private IList orderByTokens = new ArrayList();
  		private IList groupByTokens = new ArrayList();
***************
*** 860,877 ****
  			sqlString = sql.ToQuerySqlString();
  
- 			System.Type[ ] classes = new System.Type[returnTypes.Length];
- 			for( int i = 0; i < returnTypes.Length; i++ )
- 			{
- 				if( returnTypes[ i ] != null )
- 				{
- 					classes[ i ] = returnTypes[ i ].ReturnedClass;
- 				}
- 			}
- 
  			try
  			{
  				if( holderClass != null )
  				{
! 					holderConstructor = holderClass.GetConstructor( classes );
  				}
  			}
--- 860,868 ----
  			sqlString = sql.ToQuerySqlString();
  
  			try
  			{
  				if( holderClass != null )
  				{
! 					holderConstructor = ReflectHelper.GetConstructor( holderClass, returnTypes );
  				}
  			}
***************
*** 1024,1059 ****
  		}
  
! 		private JoinFragment MergeJoins( JoinFragment ojf )
  		{
! 			//classes
! 			foreach( string name in typeMap.Keys )
  			{
! 				JoinFragment join = ( JoinFragment ) joins[ name ];
! 				IQueryable p = GetPersisterForName( name );
! 				bool includeSubclasses = returnedTypes.Contains( name ) && !IsShallowQuery;
  
! 				if( join != null )
  				{
  					bool isCrossJoin = crossJoins.Contains( name );
  					ojf.AddFragment( join );
- 
  					ojf.AddJoins(
! 						( (IJoinable) p).FromJoinFragment( name, isCrossJoin, includeSubclasses ),
  						p.QueryWhereFragment( name, isCrossJoin, includeSubclasses )
  						);
- 				}
- 			}
  
! 			foreach( string name in collections.Keys )
! 			{
! 				JoinFragment collJoin = ( JoinFragment ) joins[ name ];
! 				if( collJoin != null )
  				{
! 					ojf.AddFragment( collJoin );
  				}
  			}
- 
- 			return ojf;
- 			
  		}
  
--- 1015,1048 ----
  		}
  
! 		private void MergeJoins( JoinFragment ojf )
  		{
! 			foreach( DictionaryEntry de in joins )
  			{
! 				string name = (string)de.Key;
! 				JoinFragment join = (JoinFragment) de.Value;
  
! 				if ( typeMap.Contains( name ) ) 
  				{
+ 					IQueryable p = GetPersisterForName( name );
+ 					bool includeSubclasses = returnedTypes.Contains( name )
+ 						&& !IsShallowQuery;
+ 
  					bool isCrossJoin = crossJoins.Contains( name );
  					ojf.AddFragment( join );
  					ojf.AddJoins(
! 						p.FromJoinFragment( name, isCrossJoin, includeSubclasses ),
  						p.QueryWhereFragment( name, isCrossJoin, includeSubclasses )
  						);
  
! 				}
! 				else if ( collections.Contains( name ) ) 
  				{
! 					ojf.AddFragment(join);
! 				}
! 				else 
! 				{
! 					//name from a super query (a bit inelegant that it shows up here)
  				}
  			}
  		}
  
***************
*** 1295,1299 ****
  			// TODO: 2.1 - Check that something tidies up this cmd/reader
  			IDataReader rs = GetResultSet( st, parameters.RowSelection, session );
! 			return new EnumerableImpl( rs, st, session, ReturnTypes, ScalarColumnNames, parameters.RowSelection );
  
  		}
--- 1284,1289 ----
  			// TODO: 2.1 - Check that something tidies up this cmd/reader
  			IDataReader rs = GetResultSet( st, parameters.RowSelection, session );
! 			return new EnumerableImpl( rs, st, session, ReturnTypes, ScalarColumnNames, parameters.RowSelection,
! 				holderClass );
  
  		}

[Nhibernate-commit] nhibernate/src/NHibernate/Util ReflectHelper.cs,1.26,1.27

[Sergey K. <jus...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31965/src/NHibernate/Util

Modified Files:
	ReflectHelper.cs 
Log Message:
Integrated two more tests from H2.1, fixed uncovered bugs.

Index: ReflectHelper.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Util/ReflectHelper.cs,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** ReflectHelper.cs	5 Apr 2005 14:21:21 -0000	1.26
--- ReflectHelper.cs	24 Apr 2005 19:37:57 -0000	1.27
***************
*** 281,284 ****
--- 281,318 ----
  		}
  
+ 		public static ConstructorInfo GetConstructor(System.Type type, IType[] types)
+ 		{
+ 			ConstructorInfo[] candidates = type.GetConstructors( BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic );
+ 
+ 			foreach( ConstructorInfo constructor in candidates )
+ 			{
+ 				ParameterInfo[] parameters = constructor.GetParameters();
+ 
+ 				if( parameters.Length == types.Length )
+ 				{
+ 					bool found = true;
+ 
+ 					for( int j = 0; j < parameters.Length; j++ )
+ 					{
+ 						bool ok = parameters[j].ParameterType.IsAssignableFrom(
+ 							types[j].ReturnedClass );
+ 
+ 						if( !ok )
+ 						{
+ 							found = false;
+ 							break;
+ 						}
+ 					}
+ 
+ 					if (found) 
+ 					{
+ 						return constructor;
+ 					}
+ 				}
+ 			}
+ 			throw new InstantiationException( "no appropriate constructor in class: "
+ 				+ type.FullName );
+ 		}
+ 
  		/// <summary>
  		/// Determines if the <see cref="System.Type"/> is a non creatable class.

[Nhibernate-commit] nhibernate/src/NHibernate/Impl EnumerableImpl.cs,1.10,1.11

[Sergey K. <jus...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31965/src/NHibernate/Impl

Modified Files:
	EnumerableImpl.cs 
Log Message:
Integrated two more tests from H2.1, fixed uncovered bugs.

Index: EnumerableImpl.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/EnumerableImpl.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** EnumerableImpl.cs	5 Apr 2005 14:24:34 -0000	1.10
--- EnumerableImpl.cs	24 Apr 2005 19:37:57 -0000	1.11
***************
*** 22,26 ****
  		private IType[ ] _types;
  		private bool _single;
! 		private object[ ] _currentResults;
  		private bool _hasNext;
  		private string[ ][ ] _names;
--- 22,26 ----
  		private IType[ ] _types;
  		private bool _single;
! 		private object _currentResult;
  		private bool _hasNext;
  		private string[ ][ ] _names;
***************
*** 31,34 ****
--- 31,35 ----
  		private int _currentRow = -1;
  
+ 		private System.Reflection.ConstructorInfo _holderConstructor;
  		private RowSelection _selection;
  
***************
*** 42,49 ****
  		/// <param name="columnNames">The names of the columns in the <see cref="IDataReader"/>.</param>
  		/// <param name="selection">The <see cref="RowSelection"/> that should be applied to the <see cref="IDataReader"/>.</param>
  		/// <remarks>
  		/// The <see cref="IDataReader"/> should already be positioned on the first record in <see cref="RowSelection"/>.
  		/// </remarks>
! 		public EnumerableImpl( IDataReader reader, IDbCommand cmd, ISessionImplementor sess, IType[ ] types, string[ ][ ] columnNames, RowSelection selection )
  		{
  			_reader = reader;
--- 43,52 ----
  		/// <param name="columnNames">The names of the columns in the <see cref="IDataReader"/>.</param>
  		/// <param name="selection">The <see cref="RowSelection"/> that should be applied to the <see cref="IDataReader"/>.</param>
+ 		/// <param name="holderType">Optional type of the result holder (used for "select new SomeClass(...)" queries).</param>
  		/// <remarks>
  		/// The <see cref="IDataReader"/> should already be positioned on the first record in <see cref="RowSelection"/>.
  		/// </remarks>
! 		public EnumerableImpl( IDataReader reader, IDbCommand cmd, ISessionImplementor sess, IType[ ] types, string[ ][ ] columnNames, RowSelection selection,
! 			System.Type holderType )
  		{
  			_reader = reader;
***************
*** 54,57 ****
--- 57,66 ----
  			_selection = selection;
  
+ 			if( holderType != null )
+ 			{
+ 				_holderConstructor = NHibernate.Util.ReflectHelper.GetConstructor(
+ 					holderType, types );
+ 			}
+ 
  			_single = _types.Length == 1;
  		}
***************
*** 69,73 ****
  			{
  				log.Debug( "exhausted results" );
! 				_currentResults = null;
  				_sess.Batcher.CloseQueryCommand( _cmd, _reader );
  			}
--- 78,82 ----
  			{
  				log.Debug( "exhausted results" );
! 				_currentResult = null;
  				_sess.Batcher.CloseQueryCommand( _cmd, _reader );
  			}
***************
*** 75,89 ****
  			{
  				log.Debug( "retreiving next results" );
- 				_currentResults = new object[_types.Length];
  
! 				// move through each of the ITypes contained in the IDataReader and convert them
! 				// to their objects.  
! 				for( int i = 0; i < _types.Length; i++ )
  				{
! 					// The IType knows how to extract its value out of the IDataReader.  If the IType
! 					// is a value type then the value will simply be pulled out of the IDataReader.  If
! 					// the IType is an Entity type then the IType will extract the id from the IDataReader
! 					// and use the ISession to load an instance of the object.
! 					_currentResults[ i ] = _types[ i ].NullSafeGet( _reader, _names[ i ], _sess, null );
  				}
  			}
--- 84,129 ----
  			{
  				log.Debug( "retreiving next results" );
  
! 				if( _single )
  				{
! 					_currentResult = _types[ 0 ].NullSafeGet( _reader, _names[ 0 ], _sess, null );
! 				}
! 				else
! 				{
! 					object[ ] currentResults = new object[_types.Length];
! 
! 					// move through each of the ITypes contained in the IDataReader and convert them
! 					// to their objects.  
! 					for( int i = 0; i < _types.Length; i++ )
! 					{
! 						// The IType knows how to extract its value out of the IDataReader.  If the IType
! 						// is a value type then the value will simply be pulled out of the IDataReader.  If
! 						// the IType is an Entity type then the IType will extract the id from the IDataReader
! 						// and use the ISession to load an instance of the object.
! 						currentResults[ i ] = _types[ i ].NullSafeGet( _reader, _names[ i ], _sess, null );
! 					}
! 
! 					_currentResult = currentResults;
! 				}
! 
! 				if( _holderConstructor != null )
! 				{
! 					try 
! 					{
! 						if( _currentResult == null || !_currentResult.GetType().IsArray )
! 						{
! 							_currentResult = _holderConstructor.Invoke( new object[] { _currentResult } );
! 						}
! 						else 
! 						{
! 							_currentResult = _holderConstructor.Invoke( ( object[ ] )_currentResult );
! 						}
! 					}
! 					catch( Exception e )
! 					{
! 						throw new QueryException( "Could not instantiate: "
! 							+ _holderConstructor.DeclaringType.FullName,
! 							e );
! 					}
  				}
  			}
***************
*** 118,129 ****
  			get
  			{
! 				if( _single )
! 				{
! 					return _currentResults[ 0 ];
! 				}
! 				else
! 				{
! 					return _currentResults;
! 				}
  			}
  		}
--- 158,162 ----
  			get
  			{
! 				return _currentResult;
  			}
  		}
***************
*** 201,205 ****
  				if( _hasNext ) 
  				{
! 					_currentResults = null;
  					_sess.Batcher.CloseQueryCommand( _cmd, _reader );
  				}
--- 234,238 ----
  				if( _hasNext ) 
  				{
! 					_currentResult = null;
  					_sess.Batcher.CloseQueryCommand( _cmd, _reader );
  				}

[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel Bar.cs,1.5,1.6 Baz.cs,1.14,1.15 Baz.hbm.xml,1.17,1.18 Foo.cs,1.17,1.18 FooBar.hbm.xml,1.22,1.23 Glarch.cs,1.9,1.10 Holder.cs,1.3,1.4 Master.cs,1.7,1.8

[Sergey K. <jus...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31965/src/NHibernate.DomainModel

Modified Files:
	Bar.cs Baz.cs Baz.hbm.xml Foo.cs FooBar.hbm.xml Glarch.cs 
	Holder.cs Master.cs 
Log Message:
Integrated two more tests from H2.1, fixed uncovered bugs.

Index: FooBar.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/FooBar.hbm.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** FooBar.hbm.xml	17 Jan 2005 03:31:52 -0000	1.22
--- FooBar.hbm.xml	24 Apr 2005 19:37:56 -0000	1.23
***************
*** 3,7 ****
  	<import class="NHibernate.DomainModel.FooStatus, NHibernate.DomainModel" />
  	<import class="NHibernate.DomainModel.Result, NHibernate.DomainModel" />
! 	<import class="NHibernate.DomainModel.Named, NHibernate.DomainModel" />
  
  	<class 
--- 3,7 ----
  	<import class="NHibernate.DomainModel.FooStatus, NHibernate.DomainModel" />
  	<import class="NHibernate.DomainModel.Result, NHibernate.DomainModel" />
! 	<import class="NHibernate.DomainModel.INamed, NHibernate.DomainModel" />
  
  	<class 

Index: Glarch.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Glarch.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Glarch.cs	18 Nov 2004 02:45:43 -0000	1.9
--- Glarch.cs	24 Apr 2005 19:37:56 -0000	1.10
***************
*** 5,9 ****
  {
  	[Serializable]
! 	public class Glarch : Super, GlarchProxy, ILifecycle
  	{
  	
--- 5,9 ----
  {
  	[Serializable]
! 	public class Glarch : Super, GlarchProxy, ILifecycle, INamed
  	{
  	

Index: Holder.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Holder.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Holder.cs	26 Mar 2005 13:24:35 -0000	1.3
--- Holder.cs	24 Apr 2005 19:37:56 -0000	1.4
***************
*** 16,19 ****
--- 16,27 ----
  		private Holder _otherHolder;
  
+ 		public Holder()
+ 		{
+ 		}
+ 
+ 		public Holder( string name )
+ 		{
+ 			_name = name;
+ 		}
  		
  		public string Id

Index: Baz.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Baz.hbm.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Baz.hbm.xml	3 Nov 2004 03:37:05 -0000	1.17
--- Baz.hbm.xml	24 Apr 2005 19:37:56 -0000	1.18
***************
*** 314,318 ****
  			</many-to-any>
  		</map>
! 		
  		<bag name="Bazez" lazy="true" order-by="name_b desc" cascade="all">
  			<key column="`baz id`"/>
--- 314,327 ----
  			</many-to-any>
  		</map>
! 
! 		<list name="ManyToAny" lazy="true">
! 			<key column="baz"/>
! 			<index column="ind"/>
! 			<many-to-any id-type="string">
! 				<column name="el_clazz_"/>
! 				<column name="el_id_"/>
! 			</many-to-any>
! 		</list>
! 
  		<bag name="Bazez" lazy="true" order-by="name_b desc" cascade="all">
  			<key column="`baz id`"/>

Index: Foo.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Foo.cs,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Foo.cs	17 Jan 2005 03:31:52 -0000	1.17
--- Foo.cs	24 Apr 2005 19:37:56 -0000	1.18
***************
*** 65,68 ****
--- 65,73 ----
  		{
  		}
+ 
+ 		public Foo( int x )
+ 		{
+ 			_x = x;
+ 		}
  	
  		#endregion

Index: Bar.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Bar.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Bar.cs	9 Aug 2004 18:26:21 -0000	1.5
--- Bar.cs	24 Apr 2005 19:37:56 -0000	1.6
***************
*** 5,9 ****
  {
  	[Serializable]
! 	public class Bar : Abstract, BarProxy
  	{
  		private int _x;
--- 5,9 ----
  {
  	[Serializable]
! 	public class Bar : Abstract, BarProxy, INamed
  	{
  		private int _x;

Index: Master.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Master.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Master.cs	31 Mar 2005 12:40:23 -0000	1.7
--- Master.cs	24 Apr 2005 19:37:56 -0000	1.8
***************
*** 8,12 ****
  	/// </summary>
  	[Serializable]
! 	public class Master
  	{
  		private static object _emptyObject = new object();
--- 8,12 ----
  	/// </summary>
  	[Serializable]
! 	public class Master : INamed
  	{
  		private static object _emptyObject = new object();

Index: Baz.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Baz.cs,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Baz.cs	17 Jan 2005 03:40:49 -0000	1.14
--- Baz.cs	24 Apr 2005 19:37:56 -0000	1.15
***************
*** 13,17 ****
   /// </remark>
   [Serializable]
!  public class Baz : IComparable
   {
  
--- 13,17 ----
   /// </remark>
   [Serializable]
!  public class Baz : INamed, IComparable
   {
  
***************
*** 39,42 ****
--- 39,43 ----
  	private System.Collections.IDictionary _stringGlarchMap;
  	private System.Collections.IDictionary _anyToAny;
+ 	private System.Collections.IList       _manyToAny;
  	private Iesi.Collections.ISet _fooSet;
  	private Iesi.Collections.ISet _stringSet;
***************
*** 47,53 ****
  	private System.Collections.IList _bag;
  	private System.Collections.IList _fooBag;
- 	private System.Collections.IList _bazez;
  	private System.Collections.IList _idFooBag;
  	private System.Collections.IList _byteBag;
  
  	#endregion
--- 48,54 ----
  	private System.Collections.IList _bag;
  	private System.Collections.IList _fooBag;
  	private System.Collections.IList _idFooBag;
  	private System.Collections.IList _byteBag;
+     private System.Collections.IList _bazez;
  
  	#endregion
***************
*** 315,319 ****
  	}
  
! 	/// <summary>
  	/// Gets or sets the intArray
  	/// </summary> 
--- 316,335 ----
  	}
  
! 	 /// <summary>
! 	 /// Get/set for manyToAny
! 	 /// </summary>
! 	 public System.Collections.IList ManyToAny
! 	 {
! 		 get
! 		 {
! 			 return this._manyToAny;
! 		 }
! 		 set
! 		 {
! 			 this._manyToAny = value;
! 		 }
! 	 }
! 
! 	 /// <summary>
  	/// Gets or sets the intArray
  	/// </summary> 
***************
*** 557,562 ****
  		 StringDateMap.Add( "now", DateTime.Now );
  		 StringDateMap.Add( "never", null );
! 		 StringDateMap.Add( "millenium", new DateTime( 2000, 01, 01 ) );
! 		 //StringDateMap.Add( "big bang", new DateTime(0) );
  		 ArrayList list = new ArrayList();
  		 list.AddRange( StringSet ); 
--- 573,578 ----
  		 StringDateMap.Add( "now", DateTime.Now );
  		 StringDateMap.Add( "never", null );
! 		 StringDateMap.Add( "big bang", new DateTime(0L) );
! 		 //StringDateMap.Add( "millenium", new DateTime( 2000, 01, 01 ) );
  		 ArrayList list = new ArrayList();
  		 list.AddRange( StringSet ); 

[Nhibernate-commit] nhibernate/src/NHibernate.Test TestCase.cs,1.13,1.14

[Sergey K. <jus...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5037/src/NHibernate.Test

Modified Files:
	TestCase.cs 
Log Message:
Made DDL output feature depend on a constant in TestCase

Index: TestCase.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/TestCase.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** TestCase.cs	10 Dec 2004 16:40:02 -0000	1.13
--- TestCase.cs	24 Apr 2005 15:47:08 -0000	1.14
***************
*** 17,20 ****
--- 17,21 ----
  	public abstract class TestCase 
  	{
+ 		private const bool OUTPUT_DDL = true;
  		protected Configuration cfg;
  		protected Dialect.Dialect dialect;
***************
*** 55,59 ****
  			}
  
! 			if(exportSchema) new SchemaExport(cfg).Create(true, true);
  			
  			sessions = cfg.BuildSessionFactory( );
--- 56,60 ----
  			}
  
! 			if(exportSchema) new SchemaExport(cfg).Create(OUTPUT_DDL, true);
  			
  			sessions = cfg.BuildSessionFactory( );
***************
*** 66,70 ****
  		public void DropSchema() 
  		{
! 			new SchemaExport(cfg).Drop(true, true);
  		}
  
--- 67,71 ----
  		public void DropSchema() 
  		{
! 			new SchemaExport(cfg).Drop(OUTPUT_DDL, true);
  		}
  
***************
*** 92,101 ****
  				tran.Commit();
  			}
! 			catch(Exception exc)
  			{
  				if (tran != null)
  					tran.Rollback();
  				if (error)
! 					throw exc;
  			}
  			finally
--- 93,102 ----
  				tran.Commit();
  			}
! 			catch(Exception)
  			{
  				if (tran != null)
  					tran.Rollback();
  				if (error)
! 					throw;
  			}
  			finally

[Nhibernate-commit] nhibernate/src/NHibernate/Impl SessionImpl.cs,1.81,1.82

[Sergey K. <jus...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3715/src/NHibernate/Impl

Modified Files:
	SessionImpl.cs 
Log Message:
Commented out apparently unused DoSave method

Index: SessionImpl.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/SessionImpl.cs,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** SessionImpl.cs	12 Apr 2005 02:44:26 -0000	1.81
--- SessionImpl.cs	24 Apr 2005 15:43:15 -0000	1.82
***************
*** 766,769 ****
--- 766,770 ----
  		}
  
+ 		/*
  		private object DoSave( object obj, object id )
  		{
***************
*** 916,919 ****
--- 917,921 ----
  			return id;
  		}
+ 		*/
  
  		private object DoSave( object obj, object id, IClassPersister persister, bool useIdentityColumn, Cascades.CascadingAction cascadeAction, object anything )

[Nhibernate-commit] nhibernate/src/NHibernate.Test/CfgTest ConfigurationFixture.cs,1.9,1.10

[Sergey K. <jus...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/CfgTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2457/src/NHibernate.Test/CfgTest

Modified Files:
	ConfigurationFixture.cs 
Log Message:
Marked two tests with Explicit attribute

Index: ConfigurationFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/CfgTest/ConfigurationFixture.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ConfigurationFixture.cs	21 Feb 2005 14:27:36 -0000	1.9
--- ConfigurationFixture.cs	24 Apr 2005 15:41:58 -0000	1.10
***************
*** 37,41 ****
  		/// manually just need to set all of the properties before adding classes
  		/// </summary>
! 		[Test]
  		public void ManualConfiguration() 
  		{
--- 37,41 ----
  		/// manually just need to set all of the properties before adding classes
  		/// </summary>
! 		[Test, Explicit]
  		public void ManualConfiguration() 
  		{

[Nhibernate-commit] nhibernate/src/NHibernate.Test/NHSpecificTest NH47Fixture.cs,1.1,1.2

[Sergey K. <jus...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/NHSpecificTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2457/src/NHibernate.Test/NHSpecificTest

Modified Files:
	NH47Fixture.cs 
Log Message:
Marked two tests with Explicit attribute

Index: NH47Fixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/NHSpecificTest/NH47Fixture.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NH47Fixture.cs	9 Jun 2004 01:06:22 -0000	1.1
--- NH47Fixture.cs	24 Apr 2005 15:41:58 -0000	1.2
***************
*** 52,57 ****
  		} 
  
! 		[Test]
! 		[Ignore("Only run this by itself")]
  		public void TestNH47() 
  		{ 
--- 52,56 ----
  		} 
  
! 		[Test, Explicit]
  		public void TestNH47() 
  		{ 

[Nhibernate-commit] nhibernate/src/NHibernate.Test ABCTest.cs,1.11,1.12

[Sergey K. <jus...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28331/src/NHibernate.Test

Modified Files:
	ABCTest.cs 
Log Message:
ABCTest.cs: added missing test

Index: ABCTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ABCTest.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ABCTest.cs	31 Mar 2005 12:42:39 -0000	1.11
--- ABCTest.cs	24 Apr 2005 10:29:30 -0000	1.12
***************
*** 47,59 ****
  
  		[Test]
! 		[Ignore("Test not written")]
  		public void HigherLevelIndexDefinition()
  		{
  		}
  
  		[Test]
- 		[Ignore("Test not written")]
  		public void Subselect()
  		{
  		}
  
--- 47,90 ----
  
  		[Test]
! 		[Ignore("Requires TestCase refactoring to H2.1")]
  		public void HigherLevelIndexDefinition()
  		{
+ 			/*
+ 			string[] commands = Cfg.GenerateSchemaCreationScript( Dialect );
+ 			int max = commands.Length;
+ 			bool found = false;
+ 			
+ 			foreach( string command in commands )
+ 			{
+ 				System.Console.WriteLine("Checking command : " + command);
+ 				found = command.IndexOf("create index indx_a_name") >= 0;
+ 				if (found)
+ 					break;
+ 			}
+ 			Assert.IsTrue( found, "Unable to locate indx_a_name index creation" );
+ 			*/
  		}
  
  		[Test]
  		public void Subselect()
  		{
+ 			using( ISession s = sessions.OpenSession() )
+ 			using( ITransaction t = s.BeginTransaction() )
+ 			{
+ 				B b = new B();
+ 				IDictionary map = new Hashtable();
+ 				map["a"] = "a";
+ 				map["b"] = "b";
+ 				b.Map = map;
+ 				s.Save(b);
+ 				t.Commit();
+ 			}
+ 
+ 			using( ISession s = sessions.OpenSession() )
+ 			using( ITransaction t = s.BeginTransaction() )
+ 			{
+ 				B b = (B) s.CreateQuery("from B").UniqueResult();
+ 				t.Commit();
+ 			}
  		}
  
***************
*** 123,132 ****
  			s.Close();
  		}
- 
- 		[Test]
- 		[Ignore("Test not written")]
- 		public void GetSave()
- 		{
- 		}
  	}
  }
--- 154,157 ----

[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel ABC.hbm.xml,1.9,1.10

[Sergey K. <jus...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28331/src/NHibernate.DomainModel

Modified Files:
	ABC.hbm.xml 
Log Message:
ABCTest.cs: added missing test

Index: ABC.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/ABC.hbm.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ABC.hbm.xml	16 Dec 2004 21:57:39 -0000	1.9
--- ABC.hbm.xml	24 Apr 2005 10:29:30 -0000	1.10
***************
*** 6,10 ****
  	>
  		<id 
! 			name="Id" 
  			unsaved-value="0"
  		>
--- 6,10 ----
  	>
  		<id 
! 			name="Id" column="identifier_column"
  			unsaved-value="0"
  		>
***************
*** 14,18 ****
  		
  		<discriminator 
! 			column="clazz" 
  			type="Int32" 
  			not-null="false" 
--- 14,18 ----
  		
  		<discriminator 
! 			column="clazz_discriminata" 
  			type="Int32" 
  			not-null="false" 
***************
*** 20,24 ****
  		
  		<property name="Name" />
- 		
  		<subclass 
  			name="NHibernate.DomainModel.B, NHibernate.DomainModel" 
--- 20,23 ----
***************
*** 31,34 ****
--- 30,40 ----
  			/>
  			
+ 			<map name="Map"
+ 				where="(select a.clazz_discriminata from A a where a.identifier_column = bid) &lt; 0">
+ 				<key column="BID"/>
+ 				<index column="MAPKEY" type="string"/>
+ 				<element column="MAPVAL" type="string"/>
+ 			</map>
+ 
  			<subclass 
  				name="NHibernate.DomainModel.C1, NHibernate.DomainModel" 

[Nhibernate-commit] nhibernate/src/NHibernate.Test ABCProxyTest.cs,1.15,1.16

[Sergey K. <jus...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20293/src/NHibernate.Test

Modified Files:
	ABCProxyTest.cs 
Log Message:
ABCProxyTest.cs: added missing tests

Index: ABCProxyTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ABCProxyTest.cs,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ABCProxyTest.cs	31 Mar 2005 12:42:39 -0000	1.15
--- ABCProxyTest.cs	24 Apr 2005 10:14:14 -0000	1.16
***************
*** 43,61 ****
  
  		[Test]
- 		[Ignore("Test not written")]
- 		public void DiscriminatorFiltering()
- 		{
- 		}
- 
- 		[Test]
- 		[Ignore("Test not written")]
  		public void OptionalOneToOneInCollection()
  		{
  		}
  
  		[Test]
- 		[Ignore("Test not written")]
  		public void SharedColumn()
  		{
  		}
  
--- 43,133 ----
  
  		[Test]
  		public void OptionalOneToOneInCollection()
  		{
+ 			C2 c2;
+ 
+ 			using( ISession s = sessions.OpenSession() )
+ 			using( ITransaction t = s.BeginTransaction() )
+ 			{
+ 				C1 c1 = new C1();
+ 				c2 = new C2();
+ 				c1.C2 = c2;
+ 				c2.C1 = c1;
+ 				c2.C1s = new ArrayList();
+ 				c2.C1s.Add(c1);
+ 				c1.C2 = c2;
+ 				s.Save(c2);
+ 				s.Save(c1); 
+ 				t.Commit();
+ 			}
+ 		
+ 			using( ISession s = sessions.OpenSession() )
+ 			using( ITransaction t = s.BeginTransaction() )
+ 			{
+ 				c2 = (C2)s.Get( typeof( C2 ), c2.Id );
+ 				Assert.IsTrue( c2.C1s.Count == 1 );
+ 				s.Delete( c2.C1s[0] );
+ 				s.Delete( c2 );
+ 				t.Commit();
+ 			}
  		}
  
  		[Test]
  		public void SharedColumn()
  		{
+ 			C1 c1;
+ 			C2 c2;
+ 
+ 			using( ISession s = sessions.OpenSession() )
+ 			using( ITransaction t = s.BeginTransaction() )
+ 			{
+ 				c1 = new C1();
+ 				c2 = new C2();
+ 				c1.C2 = c2;
+ 				c2.C1 = c1;
+ 				s.Save(c1);
+ 				s.Save(c2);
+ 				t.Commit();
+ 			}
+ 
+ 			using( ISession s = sessions.OpenSession() )
+ 			using( ITransaction t = s.BeginTransaction() )
+ 			{
+ 				IList list = s.Find("from B");
+ 				Assert.AreEqual( 2, list.Count );
+ 				t.Commit();
+ 			}
+ 
+ 			using( ISession s = sessions.OpenSession() )
+ 			using( ITransaction t = s.BeginTransaction() )
+ 			{
+ 				c1 = (C1) s.CreateQuery("from C1").UniqueResult();
+ 				c2 = (C2) s.CreateQuery("from C2").UniqueResult();
+ 				Assert.AreSame( c2, c1.C2 );
+ 				Assert.AreSame( c1, c2.C1 );
+ 				Assert.IsTrue( c1.C2s.Contains( c2 ) );
+ 				Assert.IsTrue( c2.C1s.Contains( c1 ) );
+ 				t.Commit();
+ 			}
+ 
+ 			using( ISession s = sessions.OpenSession() )
+ 			using( ITransaction t = s.BeginTransaction() )
+ 			{
+ 				c1 = (C1) s.Get( typeof(A), c1.Id );
+ 				c2 = (C2) s.Get( typeof(A), c2.Id );
+ 				Assert.AreSame( c2, c1.C2 );
+ 				Assert.AreSame( c1, c2.C1 );
+ 				Assert.IsTrue( c1.C2s.Contains( c2 ) );
+ 				Assert.IsTrue( c2.C1s.Contains( c1 ) );
+ 				t.Commit();
+ 			}
+ 
+ 			using( ISession s = sessions.OpenSession() )
+ 			using( ITransaction t = s.BeginTransaction() )
+ 			{
+ 				s.Delete(c1);
+ 				s.Delete(c2);
+ 				t.Commit();
+ 			}
  		}
  

[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel ABCProxy.hbm.xml,1.8,1.9 C1.cs,1.5,1.6 C2.cs,1.3,1.4

[Sergey K. <jus...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20293/src/NHibernate.DomainModel

Modified Files:
	ABCProxy.hbm.xml C1.cs C2.cs 
Log Message:
ABCProxyTest.cs: added missing tests

Index: ABCProxy.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/ABCProxy.hbm.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ABCProxy.hbm.xml	26 Mar 2005 13:24:35 -0000	1.8
--- ABCProxy.hbm.xml	24 Apr 2005 10:14:14 -0000	1.9
***************
*** 1,20 ****
  <?xml version="1.0" ?>
! <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
! 	<class 
! 		name="NHibernate.DomainModel.A, NHibernate.DomainModel" 
! 		proxy="NHibernate.DomainModel.A, NHibernate.DomainModel"
! 		discriminator-value="0"
! 	>
  		<id name="Id" unsaved-value="0" type="Int64">
  			<generator class="native" />
  		</id>
! 		<discriminator column="clazz" type="Int32" force="true" not-null="false" />
  		<property name="Name" />
! 		<many-to-one name="Forward" class="NHibernate.DomainModel.E, NHibernate.DomainModel" cascade="save-update" />
! 		<subclass 
! 			name="NHibernate.DomainModel.B, NHibernate.DomainModel" 
! 			proxy="NHibernate.DomainModel.B, NHibernate.DomainModel"
! 			discriminator-value="null"
! 		>
  			<property name="Count" column="count_" type="Int32" />
  			<map name="Map">
--- 1,16 ----
  <?xml version="1.0" ?>
! <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"
! 	assembly="NHibernate.DomainModel"
! 	namespace="NHibernate.DomainModel" >
! 
! 	<class name="A" lazy="true" discriminator-value="0">
  		<id name="Id" unsaved-value="0" type="Int64">
  			<generator class="native" />
  		</id>
! 		<discriminator column="clazz_discriminata" type="Int32" force="true" not-null="false" />
  		<property name="Name" />
! 		<many-to-one name="Forward" class="E" cascade="save-update" />
! 		
! 		<subclass name="B" lazy="true" discriminator-value="null">
  			<property name="Count" column="count_" type="Int32" />
  			<map name="Map">
***************
*** 23,48 ****
  				<element column="MAPVAL" type="Int32" />
  			</map>
! 			<subclass 
! 				name="NHibernate.DomainModel.C1, NHibernate.DomainModel" 
! 				discriminator-value="1"
! 				proxy="NHibernate.DomainModel.C1, NHibernate.DomainModel"
! 			>
  				<property name="Address" column="c1" />
! 				<one-to-one name="D" class="NHibernate.DomainModel.D, NHibernate.DomainModel" />
  			</subclass>
! 			<subclass 
! 				name="NHibernate.DomainModel.C2, NHibernate.DomainModel"
! 				proxy="NHibernate.DomainModel.C2, NHibernate.DomainModel" 
! 				discriminator-value="2"
! 			>
  				<property name="Address" column="c2" />
  			</subclass>
  		</subclass>
  	</class>
! 	<class 
! 		name="NHibernate.DomainModel.D, NHibernate.DomainModel" 
! 		proxy="NHibernate.DomainModel.D, NHibernate.DomainModel"
! 		discriminator-value="0" 
! 	>
  		<id name="Id" unsaved-value="0" type="Int64">
  			<generator class="assigned" />
--- 19,45 ----
  				<element column="MAPVAL" type="Int32" />
  			</map>
! 			
! 			<subclass name="C1" discriminator-value="1" lazy="true">
  				<property name="Address" column="c1" />
! 				<one-to-one name="D" class="D" />
! 				<many-to-one name="C2" column="c" class="C2" />
! 				<bag name="C2s" inverse="true" where="clazz_discriminata=2">
! 					<key column="c"/>
! 					<one-to-many class="C2" />
! 				</bag>
  			</subclass>
! 			
! 			<subclass name="C2" lazy="true" discriminator-value="2">
  				<property name="Address" column="c2" />
+ 				<many-to-one name="C1" column="c" class="C1" />
+ 				<bag name="C1s" inverse="true" where="clazz_discriminata=1" lazy="true">
+ 					<key column="c"/>
+ 					<one-to-many class="C1" />
+ 				</bag>
  			</subclass>
  		</subclass>
  	</class>
! 
! 	<class name="D" discriminator-value="0" lazy="true">
  		<id name="Id" unsaved-value="0" type="Int64">
  			<generator class="assigned" />
***************
*** 51,64 ****
  	</class>
  
! 	<class 
! 		name="NHibernate.DomainModel.E, NHibernate.DomainModel" 
! 		proxy="NHibernate.DomainModel.E, NHibernate.DomainModel"
! 		discriminator-value="0" 
! 	>
  		<id name="Id" unsaved-value="0" type="Int64">
  			<generator class="native" /> <!-- Hibernate 2.1 has class="increment" here -->
  		</id>
  		<property name="Amount" type="Double" />
! 		<one-to-one name="Reverse" class="NHibernate.DomainModel.A, NHibernate.DomainModel" property-ref="Forward" cascade="save-update" />
  	</class>
  
--- 48,57 ----
  	</class>
  
! 	<class name="E" discriminator-value="0" lazy="true">
  		<id name="Id" unsaved-value="0" type="Int64">
  			<generator class="native" /> <!-- Hibernate 2.1 has class="increment" here -->
  		</id>
  		<property name="Amount" type="Double" />
! 		<one-to-one name="Reverse" class="A" property-ref="Forward" cascade="save-update" />
  	</class>
  

Index: C2.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/C2.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** C2.cs	9 Dec 2004 20:57:25 -0000	1.3
--- C2.cs	24 Apr 2005 10:14:14 -0000	1.4
***************
*** 1,67 ****
  using System;
  
  namespace NHibernate.DomainModel
  {
- 
-  /// <summary>
-  /// POJO for C2
-  /// </summary>
-  /// <remark>
-  /// This class is autogenerated
-  /// </remark>
-  [Serializable]
-  public class C2 : B
-  {
- 
- 	#region Fields
- 	/// <summary>
- 	/// Holder for address
- 	/// </summary>
- 	private String _address;
- 	
- 	#endregion
- 
- 	#region Constructors
- 	/// <summary>
- 	/// Default constructor for class C2
- 	/// </summary>
- 	public C2()
- 	{
- 	}
- 	
- 	/// <summary>
- 	/// Constructor for class C2
- 	/// </summary>
- 	/// <param name="name">Initial name value</param>
- 	/// <param name="count">Initial count value</param>
- 	/// <param name="map">Initial map value</param>
- 	/// <param name="address">Initial address value</param>
- 	public C2(String name, Int32 count, System.Collections.IDictionary map, String address)
- 		: base(name, count, map)
- 	{
- 		this._address = address;
- 	}
- 	
- 	/// <summary>
- 	/// Minimal constructor for class C2
- 	/// </summary>
- 	/// <param name="map">Initial map value</param>
- 	public C2(System.Collections.IDictionary map)
- 		: base(map)
- 	{
- 	}
- 	#endregion
- 	
- 	#region Properties
  	/// <summary>
! 	/// Get/set for address
  	/// </summary>
! 	public virtual String Address
  	{
! 		get { return _address; }
! 		set { _address = value; }
  	}
! 	
! 	#endregion
!  }
! }
\ No newline at end of file
--- 1,88 ----
  using System;
+ using System.Collections;
  
  namespace NHibernate.DomainModel
  {
  	/// <summary>
! 	/// POJO for C2
  	/// </summary>
! 	/// <remark>
! 	/// This class is autogenerated
! 	/// </remark>
! 	[Serializable]
! 	public class C2 : B
  	{
! 
! 		#region Fields
! 		/// <summary>
! 		/// Holder for address
! 		/// </summary>
! 		private String _address;
! 
! 		/// <summary>
! 		/// Holder for c1
! 		/// </summary>
! 		private C1 _c1;
! 
! 		/// <summary>
! 		/// Holder for c1s
! 		/// </summary>
! 		private IList _c1s = new ArrayList();
! 
! 		#endregion
! 
! 		#region Constructors
! 		/// <summary>
! 		/// Default constructor for class C2
! 		/// </summary>
! 		public C2()
! 		{
! 		}
! 
! 		/// <summary>
! 		/// Constructor for class C2
! 		/// </summary>
! 		/// <param name="name">Initial name value</param>
! 		/// <param name="count">Initial count value</param>
! 		/// <param name="map">Initial map value</param>
! 		/// <param name="address">Initial address value</param>
! 		public C2(String name, Int32 count, IDictionary map, String address)
! 			: base(name, count, map)
! 		{
! 			this._address = address;
! 		}
! 
! 		/// <summary>
! 		/// Minimal constructor for class C2
! 		/// </summary>
! 		/// <param name="map">Initial map value</param>
! 		public C2(System.Collections.IDictionary map)
! 			: base(map)
! 		{
! 		}
! 		#endregion
! 
! 		#region Properties
! 		/// <summary>
! 		/// Get/set for address
! 		/// </summary>
! 		public virtual String Address
! 		{
! 			get { return _address; }
! 			set { _address = value; }
! 		}
! 
! 		public virtual C1 C1
! 		{
! 			get { return _c1; }
! 			set { _c1 = value; }
! 		}
! 
! 		public virtual IList C1s
! 		{
! 			get { return _c1s; }
! 			set { _c1s = value; }
! 		}
! 		#endregion
  	}
! }

Index: C1.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/C1.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** C1.cs	9 Dec 2004 20:57:25 -0000	1.5
--- C1.cs	24 Apr 2005 10:14:14 -0000	1.6
***************
*** 1,83 ****
  using System;
  
  namespace NHibernate.DomainModel
  {
! 
!  /// <summary>
!  /// POJO for C1
!  /// </summary>
!  /// <remark>
!  /// This class is autogenerated
!  /// </remark>
!  [Serializable]
!  public class C1 : B
!  {
! 
! 	#region Fields
! 	/// <summary>
! 	/// Holder for address
! 	/// </summary>
! 	private String _address;
  	
! 	/// <summary>
! 	/// Holder for d
! 	/// </summary>
! 	private D _d;
  	
! 	#endregion
  
! 	#region Constructors
! 	/// <summary>
! 	/// Default constructor for class C1
! 	/// </summary>
! 	public C1()
! 	{
! 	}
  	
! 	/// <summary>
! 	/// Constructor for class C1
! 	/// </summary>
! 	/// <param name="name">Initial name value</param>
! 	/// <param name="count">Initial count value</param>
! 	/// <param name="map">Initial map value</param>
! 	/// <param name="address">Initial address value</param>
! 	/// <param name="d">Initial d value</param>
! 	public C1(String name, Int32 count, System.Collections.IDictionary map, String address, D d)
! 		: base(name, count, map)
! 	{
! 		this._address = address;
! 		this._d = d;
! 	}
  	
! 	/// <summary>
! 	/// Minimal constructor for class C1
! 	/// </summary>
! 	/// <param name="map">Initial map value</param>
! 	public C1(System.Collections.IDictionary map)
! 		: base(map)
! 	{
! 	}
! 	#endregion
  	
! 	#region Properties
! 	/// <summary>
! 	/// Get/set for address
! 	/// </summary>
! 	public virtual String Address
  		{
! 		get { return _address; }
! 		set { _address = value; }
! 	}
  	
! 	/// <summary>
! 	/// Get/set for d
! 	/// </summary>
! 	public virtual D D
! 	{
! 		get { return _d; }
! 		set { _d = value; }
  	}
- 	
- 	#endregion
-  }
  }
\ No newline at end of file
--- 1,104 ----
  using System;
+ using System.Collections;
  
  namespace NHibernate.DomainModel
  {
! /// <summary>
! /// POJO for C1
! /// </summary>
! /// <remark>
! /// This class is autogenerated
! /// </remark>
! 	[Serializable]
! 	public class C1 : B
! 	{
! 		#region Fields
! 		/// <summary>
! 		/// Holder for address
! 		/// </summary>
! 		private String _address;
  	
! 		/// <summary>
! 		/// Holder for d
! 		/// </summary>
! 		private D _d;
  	
! 		/// <summary>
! 		/// Holder for c2
! 		/// </summary>
! 		private C2 _c2;
  
! 		/// <summary>
! 		/// Holder for c2s
! 		/// </summary>
! 		private IList _c2s = new ArrayList();
! 
! 		#endregion
! 
! 		#region Constructors
! 		/// <summary>
! 		/// Default constructor for class C1
! 		/// </summary>
! 		public C1()
! 		{
! 		}
  	
! 		/// <summary>
! 		/// Constructor for class C1
! 		/// </summary>
! 		/// <param name="name">Initial name value</param>
! 		/// <param name="count">Initial count value</param>
! 		/// <param name="map">Initial map value</param>
! 		/// <param name="address">Initial address value</param>
! 		/// <param name="d">Initial d value</param>
! 		public C1(String name, Int32 count, System.Collections.IDictionary map, String address, D d)
! 			: base(name, count, map)
! 		{
! 			this._address = address;
! 			this._d = d;
! 		}
  	
! 		/// <summary>
! 		/// Minimal constructor for class C1
! 		/// </summary>
! 		/// <param name="map">Initial map value</param>
! 		public C1(System.Collections.IDictionary map)
! 			: base(map)
! 		{
! 		}
! 		#endregion
  	
! 		#region Properties
! 		/// <summary>
! 		/// Get/set for address
! 		/// </summary>
! 		public virtual String Address
  		{
! 			get { return _address; }
! 			set { _address = value; }
! 		}
  	
! 		/// <summary>
! 		/// Get/set for d
! 		/// </summary>
! 		public virtual D D
! 		{
! 			get { return _d; }
! 			set { _d = value; }
! 		}
! 
! 		public virtual C2 C2
! 		{
! 			get { return _c2; }
! 			set { _c2 = value; }
! 		}
! 
! 		public virtual IList C2s
! 		{
! 			get { return _c2s; }
! 			set { _c2s = value; }
! 		}
! 
! 		#endregion
  	}
  }
\ No newline at end of file

[Nhibernate-commit] nhibernate/src/NHibernate NHibernate.build,1.10,1.11

[Kevin W. <kev...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30428

Modified Files:
	NHibernate.build 
Log Message:
fix bad xml in build file

Index: NHibernate.build
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/NHibernate.build,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** NHibernate.build	17 Apr 2005 17:16:04 -0000	1.10
--- NHibernate.build	21 Apr 2005 06:50:27 -0000	1.11
***************
*** 85,92 ****
  				CS1584: XML comment on 'member' has syntactically incorrect cref attribute 'invalid_syntax'
  				CS1587: XML comment is not placed on a valid language element
! 				CS1589: Unable to include XML fragment 'fragment' of file 'file' -- reason
! 				CS1590: Invalid XML include element -- Missing file attribute
  				CS1591: Missing XML comment for publicly visible type or member 'Type_or_Member'
! 				CS1592: Badly formed XML in included comments file -- 'reason'
  			-->
  			
--- 85,92 ----
  				CS1584: XML comment on 'member' has syntactically incorrect cref attribute 'invalid_syntax'
  				CS1587: XML comment is not placed on a valid language element
! 				CS1589: Unable to include XML fragment 'fragment' of file 'file' - reason
! 				CS1590: Invalid XML include element - Missing file attribute
  				CS1591: Missing XML comment for publicly visible type or member 'Type_or_Member'
! 				CS1592: Badly formed XML in included comments file - 'reason'
  			-->
  			
***************
*** 119,121 ****
  	</target>
  	
! </project>
\ No newline at end of file
--- 119,121 ----
  	</target>
  	
! </project>