nhibernate-commit — CVS Commits

[Nhibernate-commit] nhibernate/lib readme.txt,NONE,1.1

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

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

Added Files:
	readme.txt 
Log Message:
Build cleans up the bin folder so that it only contains what is needed
to use NHibernate.

--- NEW FILE: readme.txt ---
HashCodeProvider
- Implementation of System.Collections.IHashCodeProvider
- runtime, required

Castle.DynamicProxy
- Proxy Generation Library
- runtime, required

Iesi.Collection
- Implementation of Set based collections
- runtime, required

log4net
- Logging Library.
- runtime, required

nunit.framework
- NUnit Testing Library.
- buildtime

[Nhibernate-commit] nhibernate NHibernateSolution.build,1.27,1.28 readme.html,1.14,1.15

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

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

Modified Files:
	NHibernateSolution.build readme.html 
Log Message:
Build cleans up the bin folder so that it only contains what is needed
to use NHibernate.

Index: readme.html
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/readme.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** readme.html	27 Dec 2004 23:12:29 -0000	1.14
--- readme.html	28 Mar 2005 06:26:37 -0000	1.15
***************
*** 24,31 ****
  			The Hibernate documentation for the version we are porting can be found at 
  			<a href="http://nhibernate.sourceforge.net/h2.0.3-docs/reference/html/">
! 			http://nhibernate.sourceforge.net/h2.0.3-docs/reference/html/ </a>. The 
! 			first few docs will be describing the subtle differences between NHibernate and 
! 			Hibernate - including the features found in Hibernate that have not been 
! 			developed in NHibernate (yet).
  		</p>
  		<h2>Bug Reports</h2>
--- 24,28 ----
  			The Hibernate documentation for the version we are porting can be found at 
  			<a href="http://nhibernate.sourceforge.net/h2.0.3-docs/reference/html/">
! 			http://nhibernate.sourceforge.net/h2.0.3-docs/reference/html/ </a>. 
  		</p>
  		<h2>Bug Reports</h2>

Index: NHibernateSolution.build
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/NHibernateSolution.build,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** NHibernateSolution.build	28 Mar 2005 05:09:07 -0000	1.27
--- NHibernateSolution.build	28 Mar 2005 06:26:37 -0000	1.28
***************
*** 121,124 ****
--- 121,126 ----
  		<mkdir dir="${build.dir}/bin" />
  		
+ 		<copy file="lgpl.txt" tofile="${build.dir}/bin/NHibernate.license.txt"  />
+ 		
  		<!-- copy framework-nuetral libraries -->
  		<copy todir="${build.dir}/bin">
***************
*** 132,139 ****
  			<fileset basedir="${lib.dir}">
  				<!-- 
! 					excludes the Iesi.Collections because it is built during the build
! 					of NHibernate.  It is in the lib folder for vs.net convenience
  				-->
! 				<excludes name="Iesi.Collections.*" />
  				<includes name="Castle.DynamicProxy.*" />
  				<includes name="log4net.*" />
--- 134,145 ----
  			<fileset basedir="${lib.dir}">
  				<!-- 
! 					Excludes the Iesi.Collections Assembly because it is built during the build
! 					of NHibernate.  It is in the lib folder for vs.net convenience.  However, we
! 					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.*" />
***************
*** 199,220 ****
  		
  		<!-- 
! 			the test fixtures make some temporary assemblies and files that need to be
! 			cleaned up.  Ideally these should be deleted by the TestFixtures themselves
! 			but for some reason NUnit (or something else) is hanging onto those files.
  		-->
  		<delete> 
  			<fileset basedir="${build.dir}/bin">>
! 				<!-- generated by the assembly orderer -->
! 				<includes name="A.hbm.xml" />
! 				<includes name="B.hbm.xml" />
! 				<includes name="C.hbm.xml" />
! 				<includes name="A.subclass.hbm.xml" />
! 				<includes name="B.subclass.hbm.xml" />
! 				<includes name="C.subclass.hbm.xml" />
  				<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" />
  				
  			</fileset>
  		</delete>
--- 205,236 ----
  		
  		<!-- 
! 			Clean up all of the non-essential assemblies and files that get put in the
! 			bin folder to run the test fixtures and that are generated during the running
! 			of the test fixtures.
  		-->
  		<delete> 
  			<fileset basedir="${build.dir}/bin">>
! 				
! 				<!-- 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" />
  				
+ 				<!-- 
+ 					Remove test related assemblies and files so the bin directory is 
+ 					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>
  		</delete>
***************
*** 236,240 ****
  	
  	<target name="doc" depends="init" description="Builds the API documentation and the Help Documentation" >
! 		<call target="sdkdoc" />
  		<nant target="clean package" buildfile="doc/reference/doc.build" />
  	</target>
--- 252,256 ----
  	
  	<target name="doc" depends="init" description="Builds the API documentation and the Help Documentation" >
! 		<!--<call target="sdkdoc" />-->
  		<nant target="clean package" buildfile="doc/reference/doc.build" />
  	</target>

[Nhibernate-commit] nhibernate NHibernateSolution.build,1.26,1.27

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

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

Modified Files:
	NHibernateSolution.build 
Log Message:
Generation of documentation is now a part of the "package" task.

Index: NHibernateSolution.build
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/NHibernateSolution.build,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** NHibernateSolution.build	26 Feb 2005 15:54:11 -0000	1.26
--- NHibernateSolution.build	28 Mar 2005 05:09:07 -0000	1.27
***************
*** 235,238 ****
--- 235,243 ----
  	</target>
  	
+ 	<target name="doc" depends="init" description="Builds the API documentation and the Help Documentation" >
+ 		<call target="sdkdoc" />
+ 		<nant target="clean package" buildfile="doc/reference/doc.build" />
+ 	</target>
+ 	
  	<target name="sdkdoc" depends="init" description="Generates MSDN sytle documentation">
  		<ndoc>
***************
*** 300,304 ****
  	</target>
  	
! 	<target name="package" depends="test sdkdoc" description="Creates Zip files for the File Release System on SourceForge">
  		<copy todir="${build.dir}">
  			<fileset>
--- 305,309 ----
  	</target>
  	
! 	<target name="package" depends="test doc" description="Creates Zip files for the File Release System on SourceForge">
  		<copy todir="${build.dir}">
  			<fileset>

[Nhibernate-commit] nhibernate/doc/reference doc.build,1.5,1.6

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

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

Modified Files:
	doc.build 
Log Message:
Generation of documentation is now a part of the "package" task.

Index: doc.build
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/doc/reference/doc.build,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** doc.build	26 Mar 2005 22:44:29 -0000	1.5
--- doc.build	28 Mar 2005 05:08:04 -0000	1.6
***************
*** 5,26 ****
  	xmlns="http://nant.sf.net/schemas/nant-0.84.win32.net-1.0.xsd"
  >
  	<!-- 
  		I have not figured out a way to modify the Path through NAnt so you
! 		need to make sure that xsltproc is in the path
  	-->
  	
  	<property name="lang" value="en" />
! 	<property name="build.dir" value="build/${lang}" />
  	
! 	<target name="build" description="Generates html from docbook files.">
  	
  		<call target="build-html" />
  		<call target="build-chm" />
- 		
  	</target>
  	
  	<target name="build-html" description="Generates html from docbook files.">
  		 
! 		<property name="build.html.dir" value="${build.dir}/html" />
  	
  		<mkdir dir="${build.html.dir}" failonerror="false" />
--- 5,33 ----
  	xmlns="http://nant.sf.net/schemas/nant-0.84.win32.net-1.0.xsd"
  >
+ 	<!--
+ 		Required properties:
+ 			* build.dir	- (path) root level to copy built documentation to.  Only needed by package task.
+ 	-->
+ 	
  	<!-- 
  		I have not figured out a way to modify the Path through NAnt so you
! 		need to make sure that xsltproc is in the path.  
  	-->
  	
  	<property name="lang" value="en" />
! 	<property name="output.dir" value="build/${lang}" />
  	
! 	<target name="clean" description="Cleans any previous builds">
! 		<delete dir="${output.dir}" failonerror="false" />
! 	</target>
  	
+ 	<target name="build" description="Generates the documentation in multiple formats from the docbook files.">
  		<call target="build-html" />
  		<call target="build-chm" />
  	</target>
  	
  	<target name="build-html" description="Generates html from docbook files.">
  		 
! 		<property name="build.html.dir" value="${output.dir}/html" />
  	
  		<mkdir dir="${build.html.dir}" failonerror="false" />
***************
*** 30,36 ****
  		<mkdir dir="${build.html.dir}/images" failonerror="false" />
  		
! 		<!-- make the html version of the helpfile -->
! 		<exec program="xsltproc" commandline="--output build\${lang}\html\single\reference.html ${lang}\styles\html.xsl ${lang}\master.xml" />
! 		<exec program="xsltproc" commandline="--output build\${lang}\html\chunk\ ${lang}\styles\html_chunk.xsl ${lang}\master.xml" />
  		
  		<copy todir="${build.html.dir}">
--- 37,58 ----
  		<mkdir dir="${build.html.dir}/images" failonerror="false" />
  		
! 		<!-- 
! 			When using property elements that contain paths to files they
! 			unfortunately can't just be passed to the command line.  I haven't 
! 			figured out how to get the nant path seperator of "/" to be translated 
! 			windows path seperator of "\".  So we just have to use the long form. 
! 		-->
! 		<exec program="xsltproc">
! 			<arg value="--output" />
! 			<arg value="build\${lang}\html\single\reference.html" /> <!-- file to output transform results to -->
! 			<arg value="${lang}\styles\html.xsl" /> <!-- xsl to do the transforming -->
! 			<arg value="${lang}\master.xml" /> <!-- xml file to transform -->
! 		</exec>
! 		<exec program="xsltproc">
! 			<arg value="--output" />
! 			<arg value="build\${lang}\html\chunk\" /> <!-- dir to output transform results to -->
! 			<arg value="${lang}\styles\html_chunk.xsl" /> <!-- xsl to do the transforming -->
! 			<arg value="${lang}\master.xml" /> <!-- xml file to transform -->
! 		</exec>
  		
  		<copy todir="${build.html.dir}">
***************
*** 45,57 ****
  	<target name="build-chm" description="Generates chm file from docbook files.">
  		
  		<property name="hhc.exe" value="C:\Program Files\HTML Help Workshop\hhc" />
! 		<property name="build.htmlhelp.dir" value="${build.dir}/htmlhelp" />
  		
! 		<mkdir dir="${build.htmlhelp.dir}" failonerror="false" />
  		
  		<!-- make the htmlhelp version of the helpfile -->
! 		<exec program="xsltproc" commandline="--output build\${lang}\htmlhelp\ ${lang}\styles\htmlhelp.xsl ${lang}\master.xml" />
  		
! 		<copy todir="${build.htmlhelp.dir}" flatten="true">
  			<fileset basedir="${lang}">
  				<includes name="styles/*.css" />
--- 67,89 ----
  	<target name="build-chm" description="Generates chm file from docbook files.">
  		
+ 		<!-- default install location -->
  		<property name="hhc.exe" value="C:\Program Files\HTML Help Workshop\hhc" />
! 		<property name="build.chm.dir" value="${output.dir}/chm" />
  		
! 		<mkdir dir="${build.chm.dir}" failonerror="false" />
  		
  		<!-- make the htmlhelp version of the helpfile -->
! 		<exec program="xsltproc">
! 			<arg value="--output" />
! 			<arg value="build\${lang}\chm\" /> <!-- dir to output transform results to -->
! 			<arg value="${lang}\styles\htmlhelp.xsl" /> <!-- xsl to do the transforming -->
! 			<arg value="${lang}\master.xml" /> <!-- xml file to transform -->
! 		</exec>
  		
! 		<!-- 
! 			put the styles and images under the chm folder - no need to 
! 			have them in their own folder so flatten the copy task.
! 		-->
! 		<copy todir="${build.chm.dir}" flatten="true">
  			<fileset basedir="${lang}">
  				<includes name="styles/*.css" />
***************
*** 60,73 ****
  		</copy>
  		
! 		<exec program="${hhc.exe}" commandline="build\${lang}\htmlhelp\htmlhelp.hhp" />
  		
  		<delete>
! 			<fileset basedir="${build.htmlhelp.dir}">
  				<includes name="*" />
  				<excludes name="*.chm" />
  			</fileset>
  		</delete>
  	</target>
  	
  </project>
  
--- 92,115 ----
  		</copy>
  		
! 		<exec program="${hhc.exe}">
! 			<arg value="build\${lang}\chm\htmlhelp.hhp" />
! 		</exec> 
  		
  		<delete>
! 			<fileset basedir="${build.chm.dir}">
  				<includes name="*" />
  				<excludes name="*.chm" />
  			</fileset>
  		</delete>
+ 		
  	</target>
  	
+ 	<target name="package" depends="build" description="Copies the files built into the local build dir into the NH build dir.">
+ 		<move todir="${build.dir}/doc/help">
+ 			<fileset basedir="${output.dir}">
+ 				<includes name="**/*" />
+ 			</fileset>
+ 		</move>
+ 	</target>
  </project>
  

[Nhibernate-commit] nhibernate/doc/reference/en/styles htmlhelp.xsl,1.1,1.2

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

Update of /cvsroot/nhibernate/nhibernate/doc/reference/en/styles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25874/doc/reference/en/styles

Modified Files:
	htmlhelp.xsl 
Log Message:
Generation of documentation is now a part of the "package" task.

Index: htmlhelp.xsl
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/doc/reference/en/styles/htmlhelp.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** htmlhelp.xsl	26 Mar 2005 22:45:03 -0000	1.1
--- htmlhelp.xsl	28 Mar 2005 05:08:06 -0000	1.2
***************
*** 42,48 ****
  	<xsl:param name="htmlhelp.hhc.folders.instead.books" select="0"/>
  	<xsl:param name="img.src.path"></xsl:param>
  	<xsl:param name="generate.index" select="1" />
! 	<!-- These extensions are required for table printing and other stuff -->
! 
  	<!-- Generate the TOCs for named components only -->
  	<xsl:param name="generate.toc">
--- 42,48 ----
  	<xsl:param name="htmlhelp.hhc.folders.instead.books" select="0"/>
  	<xsl:param name="img.src.path"></xsl:param>
+ 	
  	<xsl:param name="generate.index" select="1" />
! 	
  	<!-- Generate the TOCs for named components only -->
  	<xsl:param name="generate.toc">

[Nhibernate-commit] nhibernate/src/NHibernate/Loader SqlLoader.cs,1.2,1.3

[Paul H. <pha...@us...>]

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

Modified Files:
	SqlLoader.cs 
Log Message:
Implements SQL querying/loading as per 2.1!

Index: SqlLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/SqlLoader.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SqlLoader.cs	14 Mar 2005 18:53:03 -0000	1.2
--- SqlLoader.cs	27 Mar 2005 23:30:28 -0000	1.3
***************
*** 10,13 ****
--- 10,14 ----
  using NHibernate.SqlCommand;
  using NHibernate.Hql;
+ using NHibernate.SqlTypes;
  using NHibernate.Type;
  using NHibernate.Util;
***************
*** 21,30 ****
  	{
  		private int parameterCount = 0;
! 		private IDictionary namedParameters = new Hashtable(4);
! 		private string sqlQuery;
! 		private IDictionary alias2Persister;
! 		private string[] aliases;
  		private ISet querySpaces = new HashedSet();
! 		//private IType[] resultTypes;
  
  		#region Constructors
--- 22,31 ----
  	{
  		private int parameterCount = 0;
! 		private readonly IDictionary namedParameters = new Hashtable(4);
! 		private readonly string sqlQuery;
! 		private readonly IDictionary alias2Persister;
! 		private readonly string[] aliases;
  		private ISet querySpaces = new HashedSet();
! 		private readonly IType[] resultTypes;
  
  		#region Constructors
***************
*** 37,46 ****
  		/// <param name="sqlQuery"></param>
  		/// <param name="additionalQuerySpaces"></param>
! 		public SqlLoader( string[] aliases, ISqlLoadable[] persisters, ISessionFactoryImplementor factory, string sqlQuery, ICollection additionalQuerySpaces) : base( factory.Dialect )
  		{
  			this.sqlQuery = sqlQuery;
  			this.aliases = aliases;
  			alias2Persister = new Hashtable();
! 			IList resultTypeList = new ArrayList();
  
  			for (int i = 0; i < persisters.Length; i++ )
--- 38,49 ----
  		/// <param name="sqlQuery"></param>
  		/// <param name="additionalQuerySpaces"></param>
! 		/// <param name="positionalTypes"></param>
! 		/// <param name="namedTypes"></param>
! 		public SqlLoader( string[] aliases, ISqlLoadable[] persisters, ISessionFactoryImplementor factory, string sqlQuery, ICollection additionalQuerySpaces, SqlType[] positionalTypes, IDictionary namedTypes ) : base( factory.Dialect )
  		{
  			this.sqlQuery = sqlQuery;
  			this.aliases = aliases;
  			alias2Persister = new Hashtable();
! 			ArrayList resultTypeList = new ArrayList();
  
  			for (int i = 0; i < persisters.Length; i++ )
***************
*** 55,61 ****
  			if ( additionalQuerySpaces != null )
  				querySpaces.AddAll( additionalQuerySpaces );
! 			//resultTypes = (IType[]) resultTypeList.ToArray() ;
  
! 			RenderStatement( persisters ) ;
  
  			PostInstantiate();
--- 58,64 ----
  			if ( additionalQuerySpaces != null )
  				querySpaces.AddAll( additionalQuerySpaces );
! 			resultTypes = ( IType[ ] ) resultTypeList.ToArray( typeof( IType ) );
  
! 			RenderStatement( persisters, positionalTypes, namedTypes ) ;
  
  			PostInstantiate();
***************
*** 74,78 ****
  
  		#region Private methods
! 		private void RenderStatement( ILoadable[] persisters )
  		{
  			int loadables = persisters.Length;
--- 77,81 ----
  
  		#region Private methods
! 		private void RenderStatement( ILoadable[] persisters, SqlType[] positionalTypes, IDictionary namedTypes )
  		{
  			int loadables = persisters.Length;
***************
*** 82,133 ****
  			LockModeArray = CreateLockModeArray( loadables, LockMode.None );
  
! 			sqlQuery = SubstituteParams( SubstituteBrackets( sqlQuery ) );
  		}
  
! 		private string SubstituteParams(string sqlQuery)
  		{
! 			string sqlString = sqlQuery;
! 			StringBuilder result = new StringBuilder();
! 			int left, right;
! 
! 			for ( int curr = 0; curr < sqlString.Length; curr = right + 1 )
! 			{
! 				if ( ( left = sqlString.IndexOf( ParserHelper.HqlVariablePrefix, curr ) ) < 0 )
! 				{
! 					result.Append( sqlString.Substring( curr ) );
! 					break;
! 				}
! 
! 				result.Append( sqlString.Substring( curr, left ) );
  
! 				// Find the first place of a HqlSeparator character
! 				right = sqlString.IndexOfAny( ParserHelper.HqlSeparators.ToCharArray(), left + 1 );
  
! 				// Did we find one?
! 				bool foundSeparator = right > 0;
! 				int chopLocation = -1;
! 				if ( right < 0 )
! 				{
! 					chopLocation = sqlString.Length;
! 				}
! 				else
  				{
! 					chopLocation = right;
  				}
! 
! 				string param = sqlString.Substring( left + 1, chopLocation );
! 				AddNamedParameter( param );
! 				result.Append( "?" );
! 				if ( foundSeparator ) 
  				{
! 					result.Append( sqlString.Substring( right, 1 ) );
  				}
  				else
  				{
! 					break;
  				}
  			}
  
! 			return result.ToString();
  		}
  
--- 85,120 ----
  			LockModeArray = CreateLockModeArray( loadables, LockMode.None );
  
! 			SqlString = SubstituteParams( SubstituteBrackets( sqlQuery ), positionalTypes, namedTypes );
  		}
  
! 		private SqlString SubstituteParams( string sql, SqlType[] positionalTypes, IDictionary namedTypes )
  		{
! 			ArrayList tokens = new ArrayList(); // contains a List of strings containing Sql or SqlStrings
  
! 			StringTokenizer st = new StringTokenizer( sql, ParserHelper.HqlSeparators );
  
! 			IEnumerator enumer = st.GetEnumerator();
! 			int index = 0;
! 			while( enumer.MoveNext() ) 
! 			{
! 				string str = (string) enumer.Current;
! 				if ( str.StartsWith( ParserHelper.HqlVariablePrefix ) )
  				{
! 					string name = str.Substring( 1 );
! 					tokens.Add( new Parameter( name, (SqlType) namedTypes[ name ] ) );
! 					AddNamedParameter( name );
  				}
! 				else if ( "?".Equals( str ) )
  				{
! 					string name = "p" + index.ToString();
! 					tokens.Add( new Parameter( name, positionalTypes[ index++ ] ) );
  				}
  				else
  				{
! 					tokens.Add( str );
  				}
  			}
  
! 			return new SqlString( ( object[] ) tokens.ToArray( typeof( object ) ) );
  		}
  
***************
*** 236,242 ****
  		public IList List( ISessionImplementor session, QueryParameters queryParameters )
  		{
! 			// TODO: 2.1 Uncomment once SQL Loading implemented
! 			//return List( session, queryParameters, querySpaces, resultTypes ) ;
! 			return null ;
  		}
  
--- 223,227 ----
  		public IList List( ISessionImplementor session, QueryParameters queryParameters )
  		{
! 			return List( session, queryParameters, querySpaces, resultTypes ) ;
  		}
  
***************
*** 263,267 ****
  				}
  
! 				result.Append( sqlString.Substring( curr, left ) );
  
  				if ( ( right = sqlString.IndexOf( '}', left + 1 ) ) < 0 )
--- 248,252 ----
  				}
  
! 				result.Append( sqlString.Substring( curr, left - curr ) );
  
  				if ( ( right = sqlString.IndexOf( '}', left + 1 ) ) < 0 )
***************
*** 270,277 ****
  				}
  
! 				string aliasPath = sqlString.Substring( left + 1, right );
  				int firstDot = aliasPath.IndexOf( '.' );
  
! 				string aliasName = firstDot == 1 ? aliasPath : aliasPath.Substring( 0, firstDot ) ;
  				ISqlLoadable currentPersister = GetPersisterByResultAlias( aliasName ) ;
  				if ( currentPersister == null )
--- 255,262 ----
  				}
  
! 				string aliasPath = sqlString.Substring( left + 1, right - left - 1 );
  				int firstDot = aliasPath.IndexOf( '.' );
  
! 				string aliasName = firstDot == -1 ? aliasPath : aliasPath.Substring( 0, firstDot ) ;
  				ISqlLoadable currentPersister = GetPersisterByResultAlias( aliasName ) ;
  				if ( currentPersister == null )
***************
*** 287,290 ****
--- 272,276 ----
  				if ( firstDot == -1 )
  				{
+ 					// TODO: should this one also be aliased/quoted instead of just directly inserted ?
  					result.Append( aliasPath ) ;
  				}
***************
*** 336,340 ****
  
  			// Possibly handle :something parameters for the query?
- 
  			return result.ToString();
  		}
--- 322,325 ----
***************
*** 345,348 ****
--- 330,334 ----
  			// want the param index to start at 0 instead of 1
  			//int loc = ++parameterCount;
+ 			// TODO: 2.1 - Not sure about the loc idea - surely we need to account for positional parameters as well?
  			int loc = parameterCount++;
  			object o = namedParameters[ name ];

[Nhibernate-commit] nhibernate/src/NHibernate/Impl SessionImpl.cs,1.76,1.77

[Paul H. <pha...@us...>]

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

Modified Files:
	SessionImpl.cs 
Log Message:
Implements SQL querying/loading as per 2.1!

Index: SessionImpl.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/SessionImpl.cs,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** SessionImpl.cs	26 Mar 2005 12:30:24 -0000	1.76
--- SessionImpl.cs	27 Mar 2005 23:30:27 -0000	1.77
***************
*** 13,16 ****
--- 13,17 ----
  using NHibernate.Persister;
  using NHibernate.Proxy;
+ using NHibernate.SqlTypes;
  using NHibernate.Type;
  using NHibernate.Util;
***************
*** 5248,5251 ****
--- 5249,5268 ----
  			}
  
+ 			SqlType[] positionalTypes = new SqlType[ queryParameters.PositionalParameterTypes.Length ];
+ 			for ( int i = 0; i < queryParameters.PositionalParameterTypes.Length; i++ )
+ 			{
+ 				IType type = queryParameters.PositionalParameterTypes[ i ] ;
+ 				positionalTypes[ i ] = type.SqlTypes( factory )[ 0 ];
+ 			}
+ 
+ 			IDictionary namedTypes = new Hashtable( queryParameters.NamedParameters.Count );
+ 			foreach( DictionaryEntry de in queryParameters.NamedParameters )
+ 			{
+ 				string name = (string) de.Key;
+ 				TypedValue typedval = (TypedValue) de.Value;
+ 				IType type = typedval.Type;
+ 				namedTypes[ name ] = type.SqlTypes( factory )[ 0 ];
+ 			}
+ 
  			ISqlLoadable[] persisters = new ISqlLoadable[ classes.Length ] ;
  			for ( int i = 0; i < classes.Length; i++ )
***************
*** 5255,5259 ****
  
  			// TODO: 2.1+ We could cache these
! 			SqlLoader loader = new SqlLoader( aliases, persisters, factory, sqlQuery, querySpaces );
  			
  			AutoFlushIfRequired( loader.QuerySpaces );
--- 5272,5277 ----
  
  			// TODO: 2.1+ We could cache these
! 			// NB In NHibernate we need the queryParameters to obtain the types of positional parameters
! 			SqlLoader loader = new SqlLoader( aliases, persisters, factory, sqlQuery, querySpaces, positionalTypes, namedTypes );
  			
  			AutoFlushIfRequired( loader.QuerySpaces );

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

[Paul H. <pha...@us...>]

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

Modified Files:
	SQLLoaderTest.cs 
Log Message:
Implements SQL querying/loading as per 2.1!

Index: SQLLoaderTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/SQLLoaderTest.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SQLLoaderTest.cs	21 Mar 2005 12:11:46 -0000	1.1
--- SQLLoaderTest.cs	27 Mar 2005 23:30:26 -0000	1.2
***************
*** 55,69 ****
  		public void TestTS()
  		{
! 			/*
! 			if ( Dialect is NHibernate.Dialect.Oracle9Dialect )
  			{
  				return;
  			}
- 			*/
  
  			ISession session = sessions.OpenSession();
  
  			Simple sim = new Simple();
! 			sim.Date = DateTime.Now;
  			session.Save( sim, 1 );
  			IQuery q = session.CreateSQLQuery( "select {sim.*} from Simple {sim} where {sim}.date_ = ?", "sim", typeof( Simple ) );
--- 55,67 ----
  		public void TestTS()
  		{
! 			if ( dialect is NHibernate.Dialect.Oracle9Dialect )
  			{
  				return;
  			}
  
  			ISession session = sessions.OpenSession();
  
  			Simple sim = new Simple();
! 			sim.Date = DateTime.Today;	// NB We don't use Now() due to the millisecond alignment problem with SQL Server
  			session.Save( sim, 1 );
  			IQuery q = session.CreateSQLQuery( "select {sim.*} from Simple {sim} where {sim}.date_ = ?", "sim", typeof( Simple ) );
***************
*** 76,100 ****
  
  		[Test]
! 		[Ignore("Test not written")]
  		public void TestFindBySQLStar()
  		{
  		}
  
  		[Test]
- 		[Ignore("Test not written")]
  		public void TestFindBySQLProperties()
  		{
  		}
  
  		[Test]
- 		[Ignore("Test not written")]
  		public void TestFindBySQLAssociatedObject()
  		{
  		}
  
  		[Test]
- 		[Ignore("Test not written")]
  		public void TestFindBySQLMultipleObject()
  		{
  		}
  
--- 74,226 ----
  
  		[Test]
! 		public void TestTSNamed()
! 		{
! 			if ( dialect is NHibernate.Dialect.Oracle9Dialect )
! 			{
! 				return;
! 			}
! 
! 			ISession session = sessions.OpenSession();
! 
! 			Simple sim = new Simple();
! 			sim.Date = DateTime.Today;	// NB We don't use Now() due to the millisecond alignment problem with SQL Server
! 			session.Save( sim, 1 );
! 			IQuery q = session.CreateSQLQuery( "select {sim.*} from Simple {sim} where {sim}.date_ = :fred", "sim", typeof( Simple ) );
! 			q.SetTimestamp( "fred", sim.Date );
! 			Assert.AreEqual( 1, q.List().Count, "q.List.Count");
! 			session.Delete( sim );
! 			session.Flush();
! 			session.Close();
! 		}
! 
! 		[Test]
  		public void TestFindBySQLStar()
  		{
+ 			ISession session = sessions.OpenSession();
+ 
+ 			Category s = new Category();
+ 			s.Name = nextLong.ToString();
+ 			nextLong++;
+ 			session.Save( s );
+ 
+ 			Simple simple = new Simple();
+ 			simple.Init();
+ 			session.Save( simple, nextLong++ );
+ 
+ 			A a = new A();
+ 			session.Save( a );
+ 
+ 			//B b = new B();
+ 			//session.Save( b );
+ 
+ 			session.CreateSQLQuery( "select {category.*} from Category {category}", "category", typeof( Category ) ).List();
+ 			session.CreateSQLQuery( "select {simple.*} from Simple {simple}", "simple", typeof( Simple ) ).List();
+ 			session.CreateSQLQuery( "select {a.*} from A {a}", "a", typeof( A ) ).List();
+ 
+ 			session.Delete( s );
+ 			session.Delete( simple );
+ 			session.Delete( a );
+ 			//session.Delete( b );
+ 			session.Flush();
+ 			session.Close();
  		}
  
  		[Test]
  		public void TestFindBySQLProperties()
  		{
+ 			ISession session = sessions.OpenSession();
+ 
+ 			Category s = new Category();
+ 			s.Name = nextLong.ToString();
+ 			nextLong++;
+ 			session.Save( s );
+ 
+ 			s = new Category();
+ 			s.Name = "WannaBeFound";
+ 			session.Flush();
+ 
+ 			IQuery query = session.CreateSQLQuery( "select {category.*} from Category {category} where {category}.name = :name", "category", typeof( Category ) );
+ 			query.SetProperties( s );
+ 
+ 			query.List();
+ 
+ 			session.Delete( "from Category" );
+ 			session.Flush();
+ 			session.Close();
  		}
  
  		[Test]
  		public void TestFindBySQLAssociatedObject()
  		{
+ 			ISession s = sessions.OpenSession();
+ 
+ 			Category c = new Category();
+ 			c.Name = "NAME";
+ 			Assignable assn = new Assignable();
+ 			assn.Id = "i.d.";
+ 			IList l = new ArrayList();
+ 			l.Add( c );
+ 			assn.Categories = l;
+ 			c.Assignable = assn;
+ 			s.Save( assn );
+ 			s.Flush();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 			IList list = s.CreateSQLQuery( "select {category.*} from Category {category}", "category", typeof( Category ) ).List();
+ 			Assert.AreEqual( 1, list.Count, "Count differs" );
+ 
+ 			s.Delete( "from Assignable" );
+ 			s.Delete( "from Category" );
+ 			s.Flush();
+ 			s.Close();
  		}
  
  		[Test]
  		public void TestFindBySQLMultipleObject()
  		{
+ 			ISession s = sessions.OpenSession();
+ 
+ 			Category c = new Category();
+ 			c.Name = "NAME";
+ 			Assignable assn = new Assignable();
+ 			assn.Id = "i.d.";
+ 			IList l = new ArrayList();
+ 			l.Add( c );
+ 			assn.Categories = l;
+ 			c.Assignable = assn;
+ 			s.Save( assn );
+ 			s.Flush();
+ 
+ 			c = new Category();
+ 			c.Name = "NAME2";
+ 			assn = new Assignable();
+ 			assn.Id = "i.d.2";
+ 			l = new ArrayList();
+ 			l.Add( c );
+ 			assn.Categories = l;
+ 			c.Assignable = assn;
+ 			s.Save( assn );
+ 			s.Flush();
+ 
+ 			assn = new Assignable();
+ 			assn.Id = "i.d.3";
+ 			s.Save( assn );
+ 			s.Flush();
+ 			s.Close();
+ 
+ 			s = sessions.OpenSession();
+ 
+ 			if ( !(dialect is Dialect.MySQLDialect) )
+ 			{
+ 				IList list = s.CreateSQLQuery( "select {category.*}, {assignable.*} from Category {category}, \"assign able\" {assignable}", new string[] { "category", "assignable" }, new System.Type[] { typeof( Category ), typeof( Assignable ) } ).List();
+ 				Assert.AreEqual( 6, list.Count, "Count differs" ); // cross-product of 2 categories x 3 assignables;
+ 				Assert.IsTrue( list[0] is object[] );
+ 			}
+ 
+ 			s.Delete( "from Assignable" );
+ 			s.Delete( "from Category" );
+ 			s.Flush();
+ 			s.Close();
  		}
  

[Nhibernate-commit] nhibernate/src/NHibernate.Test/MappingExceptions AddClassFixture.cs,1.2,1.3

[Paul H. <pha...@us...>]

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

Modified Files:
	AddClassFixture.cs 
Log Message:
Error message changed to be more informative, so test needs changing

Index: AddClassFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/MappingExceptions/AddClassFixture.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AddClassFixture.cs	21 Mar 2005 12:11:46 -0000	1.2
--- AddClassFixture.cs	27 Mar 2005 23:29:42 -0000	1.3
***************
*** 37,41 ****
  			catch( MappingException me ) 
  			{
! 				Assert.AreEqual( "persistent class not found", me.Message );
  			}
  		}	
--- 37,41 ----
  			catch( MappingException me ) 
  			{
! 				Assert.AreEqual( "persistent class " + typeof(A).FullName + " not found", me.Message );
  			}
  		}	

[Nhibernate-commit] nhibernate/src/NHibernate/Type IType.cs,1.13,1.14

[Paul H. <pha...@us...>]

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

Modified Files:
	IType.cs 
Log Message:
Changed Object to object

Index: IType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/IType.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** IType.cs	14 Mar 2005 18:54:20 -0000	1.13
--- IType.cs	27 Mar 2005 23:07:48 -0000	1.14
***************
*** 79,83 ****
  		///		path='//members[@type="IType"]/member[@name="M:IType.NullSafeGet(IDataReader, String, ISessionImplementor, Object)"]/*'
  		/// /> 
! 		object NullSafeGet( IDataReader rs, string name, ISessionImplementor session, Object owner );
  
  		/// <include file='IType.cs.xmldoc' 
--- 79,83 ----
  		///		path='//members[@type="IType"]/member[@name="M:IType.NullSafeGet(IDataReader, String, ISessionImplementor, Object)"]/*'
  		/// /> 
! 		object NullSafeGet( IDataReader rs, string name, ISessionImplementor session, object owner );
  
  		/// <include file='IType.cs.xmldoc' 

[Nhibernate-commit] nhibernate/src/NHibernate.Test/UtilityTest StringHelperFixture.cs,1.2,1.3

[Paul H. <pha...@us...>]

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

Modified Files:
	StringHelperFixture.cs 
Log Message:
Added further tests for StringHelper

Index: StringHelperFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/UtilityTest/StringHelperFixture.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StringHelperFixture.cs	1 Mar 2005 16:24:42 -0000	1.2
--- StringHelperFixture.cs	27 Mar 2005 23:07:08 -0000	1.3
***************
*** 57,61 ****
  
  		[Test]
- 		[Ignore("Test not written yet.")]
  		/// <summary>
  		/// Qualify a name with a prefix
--- 57,60 ----
***************
*** 63,70 ****
  		public void Qualify()
  		{
  		}
  
  		[Test]
- 		[Ignore("Test not written yet.")]
  		/// <summary>
  		/// Qualify an array of names with a prefix
--- 62,69 ----
  		public void Qualify()
  		{
+ 			Assert.AreEqual( "a.b", StringHelper.Qualify( "a", "b" ), "Qualified names differ" );
  		}
  
  		[Test]
  		/// <summary>
  		/// Qualify an array of names with a prefix
***************
*** 72,75 ****
--- 71,83 ----
  		public void QualifyArray()
  		{
+ 			string[] simple = { "b", "c" };
+ 			string[] qual = { "a.b", "a.c" };
+ 
+ 			string[] result = StringHelper.Qualify( "a", simple );
+ 
+ 			for (int i = 0; i < result.Length; i++ )
+ 			{
+ 				Assert.AreEqual( qual[i], result[i], "Qualified names differ" );
+ 			}
  		}
  	}

[Nhibernate-commit] nhibernate/doc/reference/en/styles html_chunk.xsl,NONE,1.1 htmlhelp.xsl,NONE,1.1

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

Update of /cvsroot/nhibernate/nhibernate/doc/reference/en/styles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21306

Added Files:
	html_chunk.xsl htmlhelp.xsl 
Log Message:
Updated build file to build chm, single html, chunked html.
little bit of work on content.
made css more of a ms style.


--- NEW FILE: html_chunk.xsl ---
<?xml version="1.0"?>

<!--

    This is the XSL HTML configuration file for the Hibernate
    Reference Documentation.

    It took me days to figure out this stuff and fix most of
    the obvious bugs in the DocBook XSL distribution. Some of
    the workarounds might not be appropriate with a newer version
    of DocBook XSL. This file is released as part of Hibernate,
    hence LGPL licensed.

    chr...@hi...
-->

<!DOCTYPE xsl:stylesheet [
    <!ENTITY db_xsl_path        "../../support/docbook-xsl/">
]>

<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                version="1.0"
                xmlns="http://www.w3.org/TR/xhtml1/transitional"
                exclude-result-prefixes="#default">
                
<xsl:import href="&db_xsl_path;/html/chunk.xsl"/>

<!--###################################################
                     HTML Settings
    ################################################### -->   

    <xsl:param name="chunk.section.depth">'5'</xsl:param>
    <xsl:param name="use.id.as.filename">'1'</xsl:param>
    
    <!--
		modified this so the stylesheet would be lang specific since it is stored
		under the lang subdirectory anyway
	-->
	<xsl:param name="html.stylesheet">../styles/html.css</xsl:param>
	
	<!--
		setting the images path so the xml can just refer to image
		by file name and then let the chm and html help files prepend
		the src however it is needed.
	-->
	<xsl:param name="img.src.path">../images/</xsl:param>

    <!-- These extensions are required for table printing and other stuff -->
    <xsl:param name="use.extensions">0</xsl:param>
    <xsl:param name="tablecolumns.extension">0</xsl:param>
    <xsl:param name="callout.extensions">1</xsl:param>
    <xsl:param name="graphicsize.extension">0</xsl:param>
    
<!--###################################################
                      Table Of Contents
    ################################################### -->   

    <!-- Generate the TOCs for named components only -->
    <xsl:param name="generate.toc">
        book   toc
    </xsl:param>
    
    <!-- Show only Sections up to level 3 in the TOCs -->
    <xsl:param name="toc.section.depth">3</xsl:param>

<!--###################################################
                         Labels
    ################################################### -->   

    <!-- Label Chapters and Sections (numbering) -->
    <xsl:param name="chapter.autolabel">1</xsl:param>
    <xsl:param name="section.autolabel" select="1"/>
    <xsl:param name="section.label.includes.component.label" select="1"/>
                
<!--###################################################
                         Callouts
    ################################################### -->   

    <!-- Don't use graphics, use a simple number style -->
    <xsl:param name="callout.graphics">0</xsl:param>

    <!-- Place callout marks at this column in annotated areas -->
    <xsl:param name="callout.defaultcolumn">90</xsl:param>

<!--###################################################
                          Misc
    ################################################### -->   

    <!-- Placement of titles -->
    <xsl:param name="formal.title.placement">
        figure after
        example before
        equation before
        table before
        procedure before
    </xsl:param>    
    
</xsl:stylesheet>

--- NEW FILE: htmlhelp.xsl ---
<?xml version="1.0"?>

<!--
	This is a modification of Hibernate's html.xsl file to generate
	a MS CHM file.

	This is the XSL HTMLHelp configuration file for the NHibernate
	Reference Documentation.

	It took me days to figure out this stuff and fix most of
	the obvious bugs in the DocBook XSL distribution. Some of
	the workarounds might not be appropriate with a newer version
	of DocBook XSL. This file is released as part of Hibernate,
	hence LGPL licensed.

	chr...@hi...
-->

<!DOCTYPE xsl:stylesheet [
	<!ENTITY db_xsl_path        "../../support/docbook-xsl/">
]>

<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
				version="1.0"
				xmlns="http://www.w3.org/TR/xhtml1/transitional"
				exclude-result-prefixes="#default">
	
<xsl:import href="&db_xsl_path;/htmlhelp/htmlhelp.xsl"/>

<!-- HTML Settings -->   

	<!--
		modified this so the stylesheet would be lang specific since it is stored
		under the lang subdirectory anyway
	-->
	<xsl:param name="html.stylesheet" select="'html.css'" />
	<xsl:param name="htmlhelp.chm" select="'reference.chm'"></xsl:param>


	<xsl:param name="suppress.navigation" select="0"/>
	<xsl:param name="htmlhelp.hhc.binary" select="0"/>
	<xsl:param name="htmlhelp.hhc.folders.instead.books" select="0"/>
	<xsl:param name="img.src.path"></xsl:param>
	<xsl:param name="generate.index" select="1" />
	<!-- These extensions are required for table printing and other stuff -->

	<!-- Generate the TOCs for named components only -->
	<xsl:param name="generate.toc">
		book   toc
	</xsl:param>
		
	<!-- Show only Sections up to level 3 in the TOCs -->
	<xsl:param name="toc.section.depth">3</xsl:param>
	
<!-- Labels -->   

	<!-- Label Chapters and Sections (numbering) -->
	<xsl:param name="chapter.autolabel">1</xsl:param>
	<xsl:param name="section.autolabel" select="1"/>
	<xsl:param name="section.label.includes.component.label" select="1"/>

<!-- Callouts -->

	<!-- Don't use graphics, use a simple number style -->
	<xsl:param name="callout.graphics">0</xsl:param>

	<!-- Place callout marks at this column in annotated areas -->
	<xsl:param name="callout.defaultcolumn">90</xsl:param>

<!-- Misc -->   

	<!-- Placement of titles -->
	<xsl:param name="formal.title.placement">
		figure after
		example before
		equation before
		table before
		procedure before
	</xsl:param>    

</xsl:stylesheet>

[Nhibernate-commit] nhibernate/doc/reference doc.build,1.4,1.5 readme.txt,1.1,1.2

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

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

Modified Files:
	doc.build readme.txt 
Log Message:
Updated build file to build chm, single html, chunked html.
little bit of work on content.
made css more of a ms style.


Index: doc.build
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/doc/reference/doc.build,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** doc.build	21 Oct 2004 13:21:41 -0000	1.4
--- doc.build	26 Mar 2005 22:44:29 -0000	1.5
***************
*** 5,24 ****
  	xmlns="http://nant.sf.net/schemas/nant-0.84.win32.net-1.0.xsd"
  >
! 
  	<property name="lang" value="en" />
  	<property name="build.dir" value="build/${lang}" />
! 	<property name="build.html.dir" value="${build.dir}/html" />
  	<target name="build" description="Generates html from docbook files.">
  	
! 		<!-- 
! 			I have not figured out a way to modify the Path through NAnt so you
! 			need to make sure that xsltproc is in the path
! 		-->
  		<mkdir dir="${build.html.dir}" failonerror="false" />
  		<mkdir dir="${build.html.dir}/single" failonerror="false" />
  		<mkdir dir="${build.html.dir}/styles" failonerror="false" />
  		<mkdir dir="${build.html.dir}/images" failonerror="false" />
  		
  		<exec program="xsltproc" commandline="--output build\${lang}\html\single\reference.html ${lang}\styles\html.xsl ${lang}\master.xml" />
  		
  		<copy todir="${build.html.dir}">
--- 5,36 ----
  	xmlns="http://nant.sf.net/schemas/nant-0.84.win32.net-1.0.xsd"
  >
! 	<!-- 
! 		I have not figured out a way to modify the Path through NAnt so you
! 		need to make sure that xsltproc is in the path
! 	-->
! 	
  	<property name="lang" value="en" />
  	<property name="build.dir" value="build/${lang}" />
! 	
  	<target name="build" description="Generates html from docbook files.">
  	
! 		<call target="build-html" />
! 		<call target="build-chm" />
! 		
! 	</target>
! 	
! 	<target name="build-html" description="Generates html from docbook files.">
! 		 
! 		<property name="build.html.dir" value="${build.dir}/html" />
! 	
  		<mkdir dir="${build.html.dir}" failonerror="false" />
  		<mkdir dir="${build.html.dir}/single" failonerror="false" />
+ 		<mkdir dir="${build.html.dir}/chunk" failonerror="false" />
  		<mkdir dir="${build.html.dir}/styles" failonerror="false" />
  		<mkdir dir="${build.html.dir}/images" failonerror="false" />
  		
+ 		<!-- make the html version of the helpfile -->
  		<exec program="xsltproc" commandline="--output build\${lang}\html\single\reference.html ${lang}\styles\html.xsl ${lang}\master.xml" />
+ 		<exec program="xsltproc" commandline="--output build\${lang}\html\chunk\ ${lang}\styles\html_chunk.xsl ${lang}\master.xml" />
  		
  		<copy todir="${build.html.dir}">
***************
*** 31,33 ****
--- 43,73 ----
  	</target>
  	
+ 	<target name="build-chm" description="Generates chm file from docbook files.">
+ 		
+ 		<property name="hhc.exe" value="C:\Program Files\HTML Help Workshop\hhc" />
+ 		<property name="build.htmlhelp.dir" value="${build.dir}/htmlhelp" />
+ 		
+ 		<mkdir dir="${build.htmlhelp.dir}" failonerror="false" />
+ 		
+ 		<!-- make the htmlhelp version of the helpfile -->
+ 		<exec program="xsltproc" commandline="--output build\${lang}\htmlhelp\ ${lang}\styles\htmlhelp.xsl ${lang}\master.xml" />
+ 		
+ 		<copy todir="${build.htmlhelp.dir}" flatten="true">
+ 			<fileset basedir="${lang}">
+ 				<includes name="styles/*.css" />
+ 				<includes name="images/**.*" />
+ 			</fileset>
+ 		</copy>
+ 		
+ 		<exec program="${hhc.exe}" commandline="build\${lang}\htmlhelp\htmlhelp.hhp" />
+ 		
+ 		<delete>
+ 			<fileset basedir="${build.htmlhelp.dir}">
+ 				<includes name="*" />
+ 				<excludes name="*.chm" />
+ 			</fileset>
+ 		</delete>
+ 	</target>
+ 	
  </project>
+ 

Index: readme.txt
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/doc/reference/readme.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** readme.txt	19 Dec 2004 00:06:14 -0000	1.1
--- readme.txt	26 Mar 2005 22:44:29 -0000	1.2
***************
*** 27,29 ****
  Docbook Xsl Guide
  =======================================
! Can be viewed at http://www.sagehill.net/docbookxsl/index.html
\ No newline at end of file
--- 27,33 ----
  Docbook Xsl Guide
  =======================================
! Can be viewed at http://www.sagehill.net/docbookxsl/index.html
! 
! URL for htmlhelp parameters
! =======================================
! http://docbook.sourceforge.net/release/xsl/snapshot/doc/html/

[Nhibernate-commit] nhibernate/doc/reference/en/modules architecture.xml,1.5,1.6 basic_mapping.xml,1.10,1.11

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

Update of /cvsroot/nhibernate/nhibernate/doc/reference/en/modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20679/en/modules

Modified Files:
	architecture.xml basic_mapping.xml 
Log Message:
Updated build file to build chm, single html, chunked html.
little bit of work on content.
made css more of a ms style.


Index: basic_mapping.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/doc/reference/en/modules/basic_mapping.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** basic_mapping.xml	28 Feb 2005 03:36:28 -0000	1.10
--- basic_mapping.xml	26 Mar 2005 22:44:13 -0000	1.11
***************
*** 1069,1073 ****
          outer-join="true|false|auto"<co id="manytoone5-co" />
          update="true|false"<co id="manytoone6-co" />
!         insert="true|false"<co id="manytoone6-co" />
          access="field|property|ClassName"<co id="manytoone7-co" />
  /&gt;</programlisting>
--- 1069,1073 ----
          outer-join="true|false|auto"<co id="manytoone5-co" />
          update="true|false"<co id="manytoone6-co" />
!         insert="true|false"<co id="manytoone7-co" />
          access="field|property|ClassName"<co id="manytoone7-co" />
  /&gt;</programlisting>
***************
*** 1170,1174 ****
  			"Components" below.
  		</para>
! 		<para>TODO: mapping sample</para>
  	</sect2>
  	<sect2 id="mapping-declaration-subclass">
--- 1170,1211 ----
  			"Components" below.
  		</para>
! 		<programlisting>&lt;component
! 	name="propertyName"<co id="component1-co" />
! 	class="ClassName"<co id="component2-co" />
! 	insert="true|false"<co id="component3-co" />
! 	update="true|false"<co id="component4-co" />
! 	access="field|property|ClassName"<co id="component5-co" />
! /&gt;</programlisting>
! <calloutlist>
! 	<callout arearefs="component1-co" id="component1">
! 		<para>
! 			<literal>name</literal>: The name of the property.
! 		</para>     
! 	</callout>
! 	<callout arearefs="component2-co" id="component2">
! 		<para>
! 			<literal>class</literal> (optional - defaults to the property type
! 			determined by reflection): The name of the component (child) class.
! 		</para>  
! 	</callout>
! 	<callout arearefs="component3-co" id="component3">
! 		<para>
! 			<literal>insert</literal>: Do the mapped columns appear in SQL 
! 			<literal>INSERT</literal>s?
! 		</para>
! 	</callout>
! 	<callout arearefs="component4-co" id="component4">
! 		<para>
! 			<literal>update</literal>: Do the mapped columns appear in SQL 
! 			<literal>UPDATE</literal>s?
! 		</para>
! 	</callout>
! 	<callout arearefs="component5-co" id="component5">
! 		<para>
! 			<literal>access</literal> (optional - defaults to <literal>property</literal>): The
! 			strategy Hibernate should use for accessing the property value.
! 		</para>
! 	</callout>
! </calloutlist>
  	</sect2>
  	<sect2 id="mapping-declaration-subclass">

Index: architecture.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/doc/reference/en/modules/architecture.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** architecture.xml	28 Feb 2005 03:36:28 -0000	1.5
--- architecture.xml	26 Mar 2005 22:44:13 -0000	1.6
***************
*** 25,29 ****
  			-->
  			<imageobject role="html">
! 				<imagedata fileref="../images/overview.gif" format="GIF" align="center"/>
  			</imageobject>
  		</mediaobject>
--- 25,29 ----
  			-->
  			<imageobject role="html">
! 				<imagedata fileref="overview.gif" format="GIF" align="center"/>
  			</imageobject>
  		</mediaobject>
***************
*** 48,52 ****
  			-->
  			<imageobject role="html">
! 				<imagedata fileref="../images/lite.gif" format="GIF" align="center"/>
  			</imageobject>
  		</mediaobject>
--- 48,52 ----
  			-->
  			<imageobject role="html">
! 				<imagedata fileref="lite.gif" format="GIF" align="center"/>
  			</imageobject>
  		</mediaobject>
***************
*** 65,69 ****
  			-->
  			<imageobject role="html">
! 				<imagedata fileref="../images/full_cream.gif" format="GIF" align="center"/>
  			</imageobject>
  		</mediaobject>
--- 65,69 ----
  			-->
  			<imageobject role="html">
! 				<imagedata fileref="full_cream.gif" format="GIF" align="center"/>
  			</imageobject>
  		</mediaobject>

[Nhibernate-commit] nhibernate/doc/reference/en master.xml,1.3,1.4

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

Update of /cvsroot/nhibernate/nhibernate/doc/reference/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20679/en

Modified Files:
	master.xml 
Log Message:
Updated build file to build chm, single html, chunked html.
little bit of work on content.
made css more of a ms style.


Index: master.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/doc/reference/en/master.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** master.xml	20 Dec 2004 00:35:53 -0000	1.3
--- master.xml	26 Mar 2005 22:44:13 -0000	1.4
***************
*** 13,17 ****
          <title>NHibernate - Relational Persistence for Idiomatic .NET</title>
          <subtitle>NHibernate Reference Documentation</subtitle>
!         <releaseinfo>Alpha</releaseinfo>
      </bookinfo>
  
--- 13,17 ----
          <title>NHibernate - Relational Persistence for Idiomatic .NET</title>
          <subtitle>NHibernate Reference Documentation</subtitle>
!         <releaseinfo>Beta</releaseinfo>
      </bookinfo>
  

[Nhibernate-commit] nhibernate/doc/reference/en/styles html.css,1.1,1.2 html.xsl,1.3,1.4

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

Update of /cvsroot/nhibernate/nhibernate/doc/reference/en/styles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20679/en/styles

Modified Files:
	html.css html.xsl 
Log Message:
Updated build file to build chm, single html, chunked html.
little bit of work on content.
made css more of a ms style.


Index: html.css
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/doc/reference/en/styles/html.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** html.css	19 Oct 2004 04:32:02 -0000	1.1
--- html.css	26 Mar 2005 22:44:13 -0000	1.2
***************
*** 1,31 ****
! BODY {
! 	font: verdana;
  }
! A {
      color: #003399;
  }
  
! A:active {
      color: #003399;
  }
  
! A:visited {
      color: #888888;
  }
  
! P, OL, UL, LI, DL, DT, DD, BLOCKQUOTE {
      color: #000000;
  }
  
! TD, TH, SPAN {
      color: #000000;
  }
  
! BLOCKQUOTE {
      margin-right: 0px;
  }
  
  
! H1, H2, H3, H4, H5, H6    {
      color: #000000;
      font-weight:500;
--- 1,39 ----
! BODY
! {
! 	font-family: Verdana;
  }
! A 
! {
      color: #003399;
  }
  
! A:active 
! {
      color: #003399;
  }
  
! A:visited 
! {
      color: #888888;
  }
  
! P, OL, UL, LI, DL, DT, DD, BLOCKQUOTE 
! {
      color: #000000;
  }
  
! TD, TH, SPAN 
! {
      color: #000000;
  }
  
! BLOCKQUOTE 
! {
      margin-right: 0px;
  }
  
  
! H1, H2, H3, H4, H5, H6    
! {
      color: #000000;
      font-weight:500;
***************
*** 34,38 ****
  }
  
! TABLE  {
      border-collapse: collapse;
      border-spacing:0;
--- 42,47 ----
  }
  
! TABLE  
! {
      border-collapse: collapse;
      border-spacing:0;
***************
*** 41,63 ****
  }
  
! TD  {
      padding: 4pt;
  }
  
! H1 { font-size: 150%; }
! H2 { font-size: 140%; }
  H3 { font-size: 110%; font-weight: bold; }
! H4 { font-size: 110%; font-weight: bold;}
  H5 { font-size: 100%; font-style: italic; }
  H6 { font-size: 100%; font-style: italic; }
  
! TT {
! font-size: 90%;
      font-family: "Courier New", Courier, monospace;
      color: #000000;
  }
  
! PRE {
! font-size: 100%;
      padding: 5px;
      border-style: solid;
--- 50,76 ----
  }
  
! TD  
! {
      padding: 4pt;
  }
  
! H1 { font-size: 130%; font-weight: bold; }
! H2 { font-size: 120%; font-weight: bold; }
  H3 { font-size: 110%; font-weight: bold; }
! H4 { font-size: 110%; font-weight: bold; }
  H5 { font-size: 100%; font-style: italic; }
  H6 { font-size: 100%; font-style: italic; }
  
! TT 
! {
! 	font-size: 90%;
      font-family: "Courier New", Courier, monospace;
      color: #000000;
  }
  
! PRE 
! {
! 	font-size: 90%;
! 	font-family: "Courier New";
      padding: 5px;
      border-style: solid;
***************
*** 67,75 ****
  }
  
! UL, OL, LI {
      list-style: disc;
  }
  
! HR  {
      width: 100%;
      height: 1px;
--- 80,90 ----
  }
  
! UL, OL, LI 
! {
      list-style: disc;
  }
  
! HR  
! {
      width: 100%;
      height: 1px;
***************
*** 80,84 ****
  }
  
! .variablelist { 
      padding-top: 10; 
      padding-bottom:10; 
--- 95,100 ----
  }
  
! .variablelist 
! { 
      padding-top: 10; 
      padding-bottom:10; 
***************
*** 86,90 ****
  }
  
! .itemizedlist, UL { 
      padding-top: 0; 
      padding-bottom:0; 
--- 102,107 ----
  }
  
! .itemizedlist, UL 
! { 
      padding-top: 0; 
      padding-bottom:0; 
***************
*** 92,96 ****
  }
  
! .term { 
      font-weight:bold;
  }
--- 109,114 ----
  }
  
! .term 
! { 
      font-weight:bold;
  }

Index: html.xsl
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/doc/reference/en/styles/html.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** html.xsl	21 Oct 2004 13:21:42 -0000	1.3
--- html.xsl	26 Mar 2005 22:44:13 -0000	1.4
***************
*** 33,37 ****
  	-->
  	<xsl:param name="html.stylesheet">../styles/html.css</xsl:param>
! 
  	<!-- These extensions are required for table printing and other stuff -->
  
--- 33,44 ----
  	-->
  	<xsl:param name="html.stylesheet">../styles/html.css</xsl:param>
! 	
! 	<!--
! 		setting the images path so the xml can just refer to image
! 		by file name and then let the chm and html help files prepend
! 		the src however it is needed.
! 	-->
! 	<xsl:param name="img.src.path">../images/</xsl:param>
! 	
  	<!-- These extensions are required for table printing and other stuff -->
  

[Nhibernate-commit] nhibernate/doc/reference/support/docbook-xsl/htmlhelp ChangeLog,NONE,1.1 htmlhelp-common.xsl,NONE,1.1 htmlhelp.xsl,NONE,1.1 profile-htmlhelp-common.xsl,NONE,1.1 profile-htmlhelp.xsl,NONE,1.1

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

Update of /cvsroot/nhibernate/nhibernate/doc/reference/support/docbook-xsl/htmlhelp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15150

Added Files:
	ChangeLog htmlhelp-common.xsl htmlhelp.xsl 
	profile-htmlhelp-common.xsl profile-htmlhelp.xsl 
Log Message:
initial use of docbook to generate chm

--- NEW FILE: htmlhelp-common.xsl ---
<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
                xmlns:exsl="http://exslt.org/common"
                xmlns:set="http://exslt.org/sets"
                xmlns:h="urn:x-hex"
		version="1.0"
                exclude-result-prefixes="doc exsl set h">

<!-- ********************************************************************
     $Id: htmlhelp-common.xsl,v 1.1 2005/03/26 22:34:32 mikedoerfler Exp $
     ******************************************************************** -->

<!-- ==================================================================== -->
<!-- Customizations of standard HTML stylesheet parameters -->

<xsl:param name="suppress.navigation" select="1"/>

<!-- ==================================================================== -->
[...1191 lines suppressed...]

  <xsl:value-of select="$angle.escaped"/>

</xsl:template>

<!-- ==================================================================== -->
<!-- Modification to standard HTML stylesheets -->

<!-- There are links from ToC pane to bibliodivs, so there must be anchor -->
<xsl:template match="bibliodiv/title">
  <h3 class="{name(.)}">
    <xsl:call-template name="anchor">
      <xsl:with-param name="node" select=".."/>
      <xsl:with-param name="conditional" select="0"/>
    </xsl:call-template>
    <xsl:apply-templates/>
  </h3>
</xsl:template>

</xsl:stylesheet>

--- NEW FILE: ChangeLog ---
2004-08-19  Jirka Kosek <ko...@us...>

	* htmlhelp-common.xsl: Added several patches from W. Borgert

2004-02-19  Jirka Kosek <ko...@us...>

	* htmlhelp-common.xsl: Added anchors to bibliodivs

2003-12-10  Jirka Kosek <ko...@us...>

	* htmlhelp-common.xsl: Fixed parameter name collision

2003-11-29  Jirka Kosek <ko...@us...>

	* htmlhelp-common.xsl: Added new HTML Help parameters from patches by W. Borgert

2003-10-27  Jirka Kosek <ko...@us...>

	* htmlhelp-common.xsl: Handle setindex in a proper way

2003-09-23  Jirka Kosek <ko...@us...>

	* htmlhelp-common.xsl: Added new parameter manifest.in.base.dir which can be used to place manifest file and also project files for HTML Help and Eclipse Help into base.dir. This improvement also fixes bug (feature) #662955.

2003-08-12  Jirka Kosek <ko...@us...>

	* htmlhelp-common.xsl: It seems that HH can handle fragments identifiers in context help, so I changed
	stylesheets back to emit filename with fragment identifier.

2003-07-22  Jirka Kosek <ko...@us...>

	* htmlhelp-common.xsl: Moving template to place where it can be reused

2003-05-25  Jirka Kosek <ko...@us...>

	* htmlhelp-common.xsl, langcodes.xml: HTML Help language codes were moved to localization files.

2003-01-31  Jirka Kosek <ko...@us...>

	* htmlhelp-common.xsl: Xalan workaround for HHK files.

2002-10-15  Jirka Kosek <ko...@us...>

	* htmlhelp-common.xsl: HTML sensitive characters are manually escaped in attribute values (we must do it, as we don't use HTML/XML output method).

2002-10-14  Jirka Kosek <ko...@us...>

	* htmlhelp-common.xsl: Options->Home command works also when base.dir parameter is used and home button is disabled

2002-08-22  Jirka Kosek <ko...@us...>

	* htmlhelp-common.xsl: Index can be alternatively created using HHK file from now. This allows see-also processing and index terms also points to their exact location.

2002-06-13  Jirka Kosek <ko...@us...>

	* .cvsignore: Reflect changes in HTML Help stylesheet organization.

	* htmlhelp-common.xsl: Added parameter for disabling HTML output when testing various HTML Help features.

	* htmlhelp-common.xsl: New features. A lot of new features. For HTML Help.

	* htmlhelp-common.xsl: Turn on more verbose messages during compilation to CHM

2002-06-12  Jirka Kosek <ko...@us...>

	* Makefile, htmlhelp-common.xsl, htmlhelp.xsl, profile-htmlhelp.xsl: 
	Rearranged code so HTML Help can be easily combined with custom chunking schemes. This is needed for TDG processing.

2002-06-09  Jirka Kosek <ko...@us...>

	* htmlhelp.xsl: Fixed bug #438793. HTML Help stylesheet works also in Xalan from now.

2002-06-03  Jirka Kosek <ko...@us...>

	* Makefile: Added dependencies for profiling stylesheets

2002-05-10  Jirka Kosek <ko...@us...>

	* htmlhelp.xsl: Updated to use shared manifest code.

2002-04-11  Jirka Kosek <ko...@us...>

	* htmlhelp.xsl: Updated to support new generate.toc parameter.

2002-03-14  Norman Walsh <nw...@us...>

	* .cvsignore: New file.

	* htmlhelp.xsl: Whitespace changes only: use PC-style CR/LF because Unix clients choke on this far less often than PC clients choke on the reverse. Grrr.

	* htmlhelp.xsl, langcodes.xml: Whitespace only: change CR/LF back to LF. Norm was a total moron.

2002-03-01  Jirka Kosek <ko...@us...>

	* Makefile: New file.

2002-02-16  Jirka Kosek <ko...@us...>

	* htmlhelp.xsl: Added missing support for refentries inside sections and for glossaries.

	* htmlhelp.xsl: Fixed bug #514883. Added missing colophon.

2002-02-10  Jirka Kosek <ko...@us...>

	* htmlhelp.xsl: Added parameter htmlhelp.default.topic for overriding default topic to display.

	* htmlhelp.xsl: Entry with link to page with Table of Contents is put into HTML Help ToC when htmlhelp.hhc.show.root=0 and generate.{set|book}.toc=1

2002-02-09  Jirka Kosek <ko...@us...>

	* htmlhelp.xsl: Added parameter which controls appearance of root element in HTML Help ToC.

2002-02-07  Jirka Kosek <ko...@us...>

	* htmlhelp.xsl: Duplicate image filenames from [FILES] section are now automatically removed in EXSLT friendly processors.

2002-02-05  Jirka Kosek <ko...@us...>

	* htmlhelp.xsl: Removed fragment identifiers from hrefs in alias.h file.

2002-02-03  Jirka Kosek <ko...@us...>

	* htmlhelp.xsl: Added parameter htmlhelp.title for manual control over HTML Help title. Improved code for automatic extraction of title from document.

2002-01-24  Jirka Kosek <ko...@us...>

	* htmlhelp.xsl: Fixed bug in alias.h when base.dir parameter was used.

2002-01-22  Jirka Kosek <ko...@us...>

	* htmlhelp.xsl: Feature request #507087. Added parameter for controling appearance of icons in HTML Help ToC.

2001-12-06  Jirka Kosek <ko...@us...>

	* htmlhelp.xsl: Template write.text.chunk moved to common place.

2001-12-04  Jirka Kosek <ko...@us...>

	* htmlhelp.xsl: Make compatible with last changes in chunking code.

2001-11-28  Jirka Kosek <ko...@us...>

	* htmlhelp.xsl: Use common pi-attribute template

	* htmlhelp.xsl: Added parameter htmlhelp.hhc.section.depth for controlling depth of sections in a TOC in a left pane of HTML Help viewer.

	* htmlhelp.xsl: Added support for automatic generation of map and context files for HTML Help. Topic names and IDs are marked by special PI <?dbhh topicname="..." topicid="..."?>.

2001-11-27  Norman Walsh <nw...@us...>

	* htmlhelp-common.xsl, htmlhelp.xsl: Removed obsolete XT support; added support for rootid parameter

	* htmlhelp.xsl: Fixed simple select typo

2001-11-27  Jirka Kosek <ko...@us...>

	* htmlhelp.xsl: Added $rootid support also for title of HTML Help window

2001-11-27  Norman Walsh <nw...@us...>

	* xthtmlhelp.xsl: Removed obsolete XT support; added support for rootid parameter

2001-11-05  Jirka Kosek <ko...@us...>

	* htmlhelp-common.xsl: Parameters moved to params subdirectory.

2001-11-04  Jirka Kosek <ko...@us...>

	* htmlhelp-common.xsl: Added parameter htmlhelp.enumerate.images which controls inclusion of image filenames list
	in project file. This is necessary when images are inserted as external binary entities.

2001-08-23  Jirka Kosek <ko...@us...>

	* htmlhelp-common.xsl: Synchronized puncation generation in ToC with rest of stylesheets.

2001-08-21  Jirka Kosek <ko...@us...>

	* htmlhelp-common.xsl: Fixed presentation of secondary indexterms in index pane

2001-08-13  Jirka Kosek <ko...@us...>

	* htmlhelp-common.xsl: Fixed problems with new lines in titles for TOC

2001-08-08  Jirka Kosek <ko...@us...>

	* htmlhelp-common.xsl: Added new parameters for controling filenames of project and output files.
	New parameter htmlhelp.hhp.tail for specifying user content for project file.

2001-07-23  Jirka Kosek <ko...@us...>

	* htmlhelp-common.xsl: Fixed bug #442162 - bibliography element is included in ToC in the left pane, index is not generated because it has own dialog also in the left pane of HTML Help viewer

2001-06-25  Jirka Kosek <ko...@us...>

	* htmlhelp-common.xsl: Added htmlhelp.autolabel parameter to control inclusion of component and section labels into tree-like ToC.

2001-05-05  Jirka Kosek <ko...@us...>

	* htmlhelp-common.xsl: Colophon is now included in toc.hhc

2001-04-21  Jirka Kosek <ko...@us...>

	* README: Removed obsolete file

2001-04-04  Norman Walsh <nw...@us...>

	* README, htmlhelp-common.xsl, htmlhelp.xsl, langcodes.xml, xthtmlhelp.xsl: 
	New file.


--- NEW FILE: profile-htmlhelp-common.xsl ---
<?xml version="1.0" encoding="US-ASCII"?>
<!--This file was created automatically by xsl2profile-->
<!--from the DocBook XSL stylesheets. Do not edit this file.-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns:exsl="http://exslt.org/common" xmlns:set="http://exslt.org/sets" xmlns:h="urn:x-hex" xmlns:exslt="http://exslt.org/common" exslt:dummy="dummy" extension-element-prefixes="exslt" version="1.0" exclude-result-prefixes="doc exsl set h exslt">

<!-- ********************************************************************
     $Id: profile-htmlhelp-common.xsl,v 1.1 2005/03/26 22:34:32 mikedoerfler Exp $
     ******************************************************************** -->

<!-- ==================================================================== -->
<!-- Customizations of standard HTML stylesheet parameters -->

<xsl:param name="suppress.navigation" select="1"/>

<!-- ==================================================================== -->

<xsl:variable name="htmlhelp.generate.index" select="//indexterm[1]"/>

<xsl:variable name="raw.help.title">
[...1160 lines suppressed...]

  <xsl:value-of select="$angle.escaped"/>

</xsl:template>

<!-- ==================================================================== -->
<!-- Modification to standard HTML stylesheets -->

<!-- There are links from ToC pane to bibliodivs, so there must be anchor -->
<xsl:template match="bibliodiv/title">
  <h3 class="{name(.)}">
    <xsl:call-template name="anchor">
      <xsl:with-param name="node" select=".."/>
      <xsl:with-param name="conditional" select="0"/>
    </xsl:call-template>
    <xsl:apply-templates/>
  </h3>
</xsl:template>

</xsl:stylesheet>

--- NEW FILE: profile-htmlhelp.xsl ---
<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
                xmlns:exsl="http://exslt.org/common"
                xmlns:set="http://exslt.org/sets"
		version="1.0"
                exclude-result-prefixes="doc exsl set">

<!-- ********************************************************************
     $Id: profile-htmlhelp.xsl,v 1.1 2005/03/26 22:34:32 mikedoerfler Exp $
     ******************************************************************** 

     This file is used by htmlhelp.xsl if you want to generate source
     files for HTML Help.  It is based on the XSL DocBook Stylesheet
     distribution (especially on JavaHelp code) from Norman Walsh.

     ******************************************************************** -->

<xsl:import href="../html/chunk.xsl"/>
<xsl:include href="profile-htmlhelp-common.xsl"/>

</xsl:stylesheet>

--- NEW FILE: htmlhelp.xsl ---
<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
                xmlns:exsl="http://exslt.org/common"
                xmlns:set="http://exslt.org/sets"
		version="1.0"
                exclude-result-prefixes="doc exsl set">

<!-- ********************************************************************
     $Id: htmlhelp.xsl,v 1.1 2005/03/26 22:34:32 mikedoerfler Exp $
     ******************************************************************** 

     This file is used by htmlhelp.xsl if you want to generate source
     files for HTML Help.  It is based on the XSL DocBook Stylesheet
     distribution (especially on JavaHelp code) from Norman Walsh.

     ******************************************************************** -->

<xsl:import href="../html/chunk.xsl"/>
<xsl:include href="htmlhelp-common.xsl"/>

</xsl:stylesheet>

[Nhibernate-commit] nhibernate/doc/reference/support/docbook-xsl/htmlhelp - New directory

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

Update of /cvsroot/nhibernate/nhibernate/doc/reference/support/docbook-xsl/htmlhelp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14161/htmlhelp

Log Message:
Directory /cvsroot/nhibernate/nhibernate/doc/reference/support/docbook-xsl/htmlhelp added to the repository

[Nhibernate-commit] nhibernate/src/NHibernate/Persister NormalizedEntityPersister.cs,1.41,1.42

[Paul H. <pha...@us...>]

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

Modified Files:
	NormalizedEntityPersister.cs 
Log Message:
Tagged feature with a TODO - 2.1

Index: NormalizedEntityPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Persister/NormalizedEntityPersister.cs,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** NormalizedEntityPersister.cs	14 Mar 2005 18:53:15 -0000	1.41
--- NormalizedEntityPersister.cs	26 Mar 2005 15:36:40 -0000	1.42
***************
*** 852,856 ****
  		protected virtual SqlString GenerateConcreteSelectString( )
  		{
! 			// TODO: This needs work
  			const string ConcreteAlias = "x";
  
--- 852,881 ----
  		protected virtual SqlString GenerateConcreteSelectString( )
  		{
! 			// TODO: 2.1 This needs work - java version shown below
! 			/*
! 			String select = "select " + 
! 				StringHelper.join( 
! 					StringHelper.COMMA_SPACE, 
! 					StringHelper.qualify( CONCRETE_ALIAS, getIdentifierColumnNames() ) 
! 				) +
! 				concretePropertySelectFragment( CONCRETE_ALIAS, getPropertyUpdateability() ) + 
! 				" from " +
! 				fromTableFragment(CONCRETE_ALIAS) + 
! 				fromJoinFragment(CONCRETE_ALIAS, true, false) +
! 				" where " +
! 				StringHelper.join(
! 					"=? and ", 
! 					StringHelper.qualify( CONCRETE_ALIAS, getIdentifierColumnNames() ) 
! 				) +
! 				"=?" +
! 				whereJoinFragment(CONCRETE_ALIAS, true, false);
! 			if ( isVersioned() ) {
! 				select += 
! 					" and " + 
! 					getVersionColumnName() + 
! 					"=?";
! 			} 
! 			return select;
! 			*/
  			const string ConcreteAlias = "x";
  
***************
*** 862,867 ****
  
  			ConcretePropertySelectFragment( builder, ConcreteAlias, PropertyUpdateability );
! 
  			builder.SetIdentityColumn( StringHelper.Qualify( ConcreteAlias, IdentifierColumnNames ), IdentifierType );
  			if( IsVersioned )
  			{
--- 887,895 ----
  
  			ConcretePropertySelectFragment( builder, ConcreteAlias, PropertyUpdateability );
! 			//FromTableFragment( ConcreteAlias );
! 			//FromJoinFragment( ConcreteAlias, true, false );
! 			//" where "
  			builder.SetIdentityColumn( StringHelper.Qualify( ConcreteAlias, IdentifierColumnNames ), IdentifierType );
+ 			//WhereJoinFragment( alias, true, false );
  			if( IsVersioned )
  			{

[Nhibernate-commit] nhibernate/src/NHibernate/Collection PersistentCollection.cs,1.23,1.24

[Paul H. <pha...@us...>]

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

Modified Files:
	PersistentCollection.cs 
Log Message:
Fix as per HB-1466

Index: PersistentCollection.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Collection/PersistentCollection.cs,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** PersistentCollection.cs	14 Mar 2005 18:51:49 -0000	1.23
--- PersistentCollection.cs	26 Mar 2005 15:33:32 -0000	1.24
***************
*** 492,499 ****
  		public void ForceInitialization()
  		{
! 			if( initializing ) throw new AssertionFailure("force initialize loading collection");
! 			if( session == null ) throw new HibernateException("collection is not associated with any session");
! 			if( !session.IsConnected ) throw new HibernateException("disconnected session");
! 			if( !initialized ) session.InitializeCollection( this, false );
  		}
  
--- 492,502 ----
  		public void ForceInitialization()
  		{
! 			if (!initialized)
! 			{
! 				if( initializing ) throw new AssertionFailure("force initialize loading collection");
! 				if( session == null ) throw new HibernateException("collection is not associated with any session");
! 				if( !session.IsConnected ) throw new HibernateException("disconnected session");
! 				session.InitializeCollection( this, false );
! 			}
  		}
  

[Nhibernate-commit] nhibernate/src/NHibernate.Test ABCProxyTest.cs,1.13,1.14 FooBarTest.cs,1.87,1.88

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

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

Modified Files:
	ABCProxyTest.cs FooBarTest.cs 
Log Message:
Fixed messed up formatting

Index: FooBarTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/FooBarTest.cs,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** FooBarTest.cs	26 Mar 2005 13:24:35 -0000	1.87
--- FooBarTest.cs	26 Mar 2005 14:10:51 -0000	1.88
***************
*** 17,39 ****
  		{
  			ExportSchema(new string[] {   
! 										  "FooBar.hbm.xml",
! 										  "Baz.hbm.xml",
! 										  "Qux.hbm.xml",
! 										  "Glarch.hbm.xml",
! 										  "Fum.hbm.xml",
! 										  "Fumm.hbm.xml",
! 										  "Fo.hbm.xml",
! 										  "One.hbm.xml",
! 										  "Many.hbm.xml",
! 										  "Immutable.hbm.xml" ,
! 										  "Fee.hbm.xml",
! 										  "Vetoer.hbm.xml",
! 										  "Holder.hbm.xml",
! 										  "Location.hbm.xml",
! 										  "Stuff.hbm.xml",
! 										  "Container.hbm.xml",
! 										  "Simple.hbm.xml",
! 										  "XY.hbm.xml"
! 									  }, true);
  		}
  
--- 17,39 ----
  		{
  			ExportSchema(new string[] {   
! 					"FooBar.hbm.xml",
! 					"Baz.hbm.xml",
! 					"Qux.hbm.xml",
! 					"Glarch.hbm.xml",
! 					"Fum.hbm.xml",
! 					"Fumm.hbm.xml",
! 					"Fo.hbm.xml",
! 					"One.hbm.xml",
! 					"Many.hbm.xml",
! 					"Immutable.hbm.xml" ,
! 					"Fee.hbm.xml",
! 					"Vetoer.hbm.xml",
! 					"Holder.hbm.xml",
! 					"Location.hbm.xml",
! 					"Stuff.hbm.xml",
! 					"Container.hbm.xml",
! 					"Simple.hbm.xml",
! 					"XY.hbm.xml"
! 				}, true);
  		}
  
***************
*** 816,820 ****
  
  		[Test]
! 			//[Ignore("TimeZone Portions commented out - http://jira.nhibernate.org:8080/browse/NH-88")]
  		public void AssociationId() 
  		{
--- 816,820 ----
  
  		[Test]
! 		//[Ignore("TimeZone Portions commented out - http://jira.nhibernate.org:8080/browse/NH-88")]
  		public void AssociationId() 
  		{
***************
*** 968,972 ****
  		{
  			ISession s = sessions.OpenSession();
! 			//			ITransaction t = s.BeginTransaction();
  			Foo[] foos = new Foo[] { null, new Foo() };
  			s.Save(foos[1]);
--- 968,972 ----
  		{
  			ISession s = sessions.OpenSession();
! //			ITransaction t = s.BeginTransaction();
  			Foo[] foos = new Foo[] { null, new Foo() };
  			s.Save(foos[1]);
***************
*** 1071,1075 ****
  			s.Delete(baz2);
  			s.Delete(foos[1]);
! 			//			t.Commit();
  			s.Close();
  
--- 1071,1075 ----
  			s.Delete(baz2);
  			s.Delete(foos[1]);
! //			t.Commit();
  			s.Close();
  
***************
*** 1202,1207 ****
  			//if( !(dialect is Dialect.SAPDBDialect) ) 
  			//{
! 			list = s.Find("select distinct foo from baz in class NHibernate.DomainModel.Baz, foo in baz.FooArray.elements");
! 			Assert.AreEqual( 2, list.Count, "collection.elements find" );
  			//}
  
--- 1202,1207 ----
  			//if( !(dialect is Dialect.SAPDBDialect) ) 
  			//{
! 				list = s.Find("select distinct foo from baz in class NHibernate.DomainModel.Baz, foo in baz.FooArray.elements");
! 				Assert.AreEqual( 2, list.Count, "collection.elements find" );
  			//}
  
***************
*** 1786,1793 ****
  			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'" );
--- 1786,1793 ----
  			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'" );
***************
*** 3362,3367 ****
  				bool proxyBoolean = ( (FooProxy)s.Load( typeof(Foo), id )).Boolean;
  			}
! 				// this won't work until Proxies are implemented because now it throws an 
! 				// ObjectNotFoundException
  			catch(LazyInitializationException lie) 
  			{
--- 3362,3367 ----
  				bool proxyBoolean = ( (FooProxy)s.Load( typeof(Foo), id )).Boolean;
  			}
! 			// this won't work until Proxies are implemented because now it throws an 
! 			// ObjectNotFoundException
  			catch(LazyInitializationException lie) 
  			{

Index: ABCProxyTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ABCProxyTest.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ABCProxyTest.cs	26 Mar 2005 13:24:35 -0000	1.13
--- ABCProxyTest.cs	26 Mar 2005 14:10:51 -0000	1.14
***************
*** 43,47 ****
  
  		[Test]
! 			//[Ignore("Proxies Required - http://jira.nhibernate.org:8080/browse/NH-41")]
  		public void Subclassing()
  		{
--- 43,47 ----
  
  		[Test]
! 		//[Ignore("Proxies Required - http://jira.nhibernate.org:8080/browse/NH-41")]
  		public void Subclassing()
  		{

[Nhibernate-commit] nhibernate/src/NHibernate.Test ABCProxyTest.cs,1.12,1.13 FooBarTest.cs,1.86,1.87

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

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

Modified Files:
	ABCProxyTest.cs FooBarTest.cs 
Log Message:
Ported property-ref attribute implementation from Hibernate 2.1

Index: FooBarTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/FooBarTest.cs,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** FooBarTest.cs	14 Mar 2005 18:56:13 -0000	1.86
--- FooBarTest.cs	26 Mar 2005 13:24:35 -0000	1.87
***************
*** 17,39 ****
  		{
  			ExportSchema(new string[] {   
! 				"FooBar.hbm.xml",
! 				"Baz.hbm.xml",
! 				"Qux.hbm.xml",
! 				"Glarch.hbm.xml",
! 				"Fum.hbm.xml",
! 				"Fumm.hbm.xml",
! 				"Fo.hbm.xml",
! 				"One.hbm.xml",
! 				"Many.hbm.xml",
! 				"Immutable.hbm.xml" ,
! 				"Fee.hbm.xml",
! 				"Vetoer.hbm.xml",
! 				"Holder.hbm.xml",
! 				"Location.hbm.xml",
! 				"Stuff.hbm.xml",
! 				"Container.hbm.xml",
! 				"Simple.hbm.xml",
! 				"XY.hbm.xml"
! 				}, true);
  		}
  
--- 17,39 ----
  		{
  			ExportSchema(new string[] {   
! 										  "FooBar.hbm.xml",
! 										  "Baz.hbm.xml",
! 										  "Qux.hbm.xml",
! 										  "Glarch.hbm.xml",
! 										  "Fum.hbm.xml",
! 										  "Fumm.hbm.xml",
! 										  "Fo.hbm.xml",
! 										  "One.hbm.xml",
! 										  "Many.hbm.xml",
! 										  "Immutable.hbm.xml" ,
! 										  "Fee.hbm.xml",
! 										  "Vetoer.hbm.xml",
! 										  "Holder.hbm.xml",
! 										  "Location.hbm.xml",
! 										  "Stuff.hbm.xml",
! 										  "Container.hbm.xml",
! 										  "Simple.hbm.xml",
! 										  "XY.hbm.xml"
! 									  }, true);
  		}
  
***************
*** 816,820 ****
  
  		[Test]
! 		//[Ignore("TimeZone Portions commented out - http://jira.nhibernate.org:8080/browse/NH-88")]
  		public void AssociationId() 
  		{
--- 816,820 ----
  
  		[Test]
! 			//[Ignore("TimeZone Portions commented out - http://jira.nhibernate.org:8080/browse/NH-88")]
  		public void AssociationId() 
  		{
***************
*** 968,972 ****
  		{
  			ISession s = sessions.OpenSession();
! //			ITransaction t = s.BeginTransaction();
  			Foo[] foos = new Foo[] { null, new Foo() };
  			s.Save(foos[1]);
--- 968,972 ----
  		{
  			ISession s = sessions.OpenSession();
! 			//			ITransaction t = s.BeginTransaction();
  			Foo[] foos = new Foo[] { null, new Foo() };
  			s.Save(foos[1]);
***************
*** 1071,1075 ****
  			s.Delete(baz2);
  			s.Delete(foos[1]);
! //			t.Commit();
  			s.Close();
  
--- 1071,1075 ----
  			s.Delete(baz2);
  			s.Delete(foos[1]);
! 			//			t.Commit();
  			s.Close();
  
***************
*** 1202,1207 ****
  			//if( !(dialect is Dialect.SAPDBDialect) ) 
  			//{
! 				list = s.Find("select distinct foo from baz in class NHibernate.DomainModel.Baz, foo in baz.FooArray.elements");
! 				Assert.AreEqual( 2, list.Count, "collection.elements find" );
  			//}
  
--- 1202,1207 ----
  			//if( !(dialect is Dialect.SAPDBDialect) ) 
  			//{
! 			list = s.Find("select distinct foo from baz in class NHibernate.DomainModel.Baz, foo in baz.FooArray.elements");
! 			Assert.AreEqual( 2, list.Count, "collection.elements find" );
  			//}
  
***************
*** 1777,1781 ****
  			list = s.Find( "select foo, bar from Foo foo left outer join foo.TheFoo bar where foo = ?",
  				foo,
! 			               NHibernateUtil.Entity( typeof(Foo) )
  				);
  
--- 1777,1781 ----
  			list = s.Find( "select foo, bar from Foo foo left outer join foo.TheFoo bar where foo = ?",
  				foo,
! 				NHibernateUtil.Entity( typeof(Foo) )
  				);
  
***************
*** 1786,1793 ****
  			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'" );
--- 1786,1793 ----
  			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'" );
***************
*** 2126,2131 ****
  			s = sessions.OpenSession();
  			Assert.AreEqual( 10, 
! 					s.Delete( "from Simple" ),
! 					"delete by query" );
  			
  			s.Flush();
--- 2126,2131 ----
  			s = sessions.OpenSession();
  			Assert.AreEqual( 10, 
! 				s.Delete( "from Simple" ),
! 				"delete by query" );
  			
  			s.Flush();
***************
*** 3256,3260 ****
  				e = s.Enumerable("from baz in class NHibernate.DomainModel.Baz where ? in baz.FooArray.elements", 
  					foo, 
! 				                 NHibernateUtil.Entity( typeof(Foo) ) ).GetEnumerator();
  				
  				Assert.IsFalse( e.MoveNext() );
--- 3256,3260 ----
  				e = s.Enumerable("from baz in class NHibernate.DomainModel.Baz where ? in baz.FooArray.elements", 
  					foo, 
! 					NHibernateUtil.Entity( typeof(Foo) ) ).GetEnumerator();
  				
  				Assert.IsFalse( e.MoveNext() );
***************
*** 3362,3367 ****
  				bool proxyBoolean = ( (FooProxy)s.Load( typeof(Foo), id )).Boolean;
  			}
! 			// this won't work until Proxies are implemented because now it throws an 
! 			// ObjectNotFoundException
  			catch(LazyInitializationException lie) 
  			{
--- 3362,3367 ----
  				bool proxyBoolean = ( (FooProxy)s.Load( typeof(Foo), id )).Boolean;
  			}
! 				// this won't work until Proxies are implemented because now it throws an 
! 				// ObjectNotFoundException
  			catch(LazyInitializationException lie) 
  			{
***************
*** 3717,3720 ****
--- 3717,3757 ----
  			Assert.AreEqual( 1, loadedGlarch.ProxySet.Count );
  		}
+ 
+ 		[Test]
+ 		public void PropertyRef()
+ 		{
+ 			object qid;
+ 			object hid;
+ 
+ 			using( ISession s = sessions.OpenSession() )
+ 			{
+ 				Holder h = new Holder();
+ 				h.Name = "foo";
+ 				Holder h2 = new Holder();
+ 				h2.Name = "bar";
+ 				h.OtherHolder = h2;
+ 				hid = s.Save(h);
+ 				
+ 				Qux q = new Qux();
+ 				q.Holder = h2;
+ 				qid = s.Save( q );
+ 				s.Flush();
+ 			}
+ 
+ 			using( ISession s = sessions.OpenSession() )
+ 			{
+ 				Holder h = (Holder) s.Load( typeof(Holder), hid );
+ 				Assert.AreEqual( h.Name, "foo" );
+ 				Assert.AreEqual( h.OtherHolder.Name, "bar" );
+ 				object[] res = (object[]) s.Find("from Holder h join h.OtherHolder oh where h.OtherHolder.Name = 'bar'")[0];
+ 				Assert.AreSame( h, res[0] );
+ 
+ 				Qux q = (Qux) s.Get( typeof(Qux), qid );
+ 				Assert.AreSame( q.Holder, h.OtherHolder );
+ 				s.Delete( h );
+ 				s.Delete( q );
+ 				s.Flush();
+ 			}
+ 		}
  	}
  }

Index: ABCProxyTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ABCProxyTest.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ABCProxyTest.cs	17 Jan 2005 03:40:51 -0000	1.12
--- ABCProxyTest.cs	26 Mar 2005 13:24:35 -0000	1.13
***************
*** 43,47 ****
  
  		[Test]
! 		//[Ignore("Proxies Required - http://jira.nhibernate.org:8080/browse/NH-41")]
  		public void Subclassing()
  		{
--- 43,47 ----
  
  		[Test]
! 			//[Ignore("Proxies Required - http://jira.nhibernate.org:8080/browse/NH-41")]
  		public void Subclassing()
  		{
***************
*** 190,193 ****
--- 190,261 ----
  			t.Commit();
  		}
+ 
+ 		[Test]
+ 		public void OneToOne()
+ 		{
+ 			A a = new A();
+ 			E d1 = new E();
+ 			C1 c = new C1();
+ 			E d2 = new E();
+ 			a.Forward = d1;
+ 			d1.Reverse = a;
+ 			c.Forward = d2;
+ 			d2.Reverse = c;
+ 
+ 			object aid;
+ 			object d2id;
+ 
+ 			using( ISession s = sessions.OpenSession() )
+ 			using( ITransaction t = s.BeginTransaction() )
+ 			{
+ 				aid = s.Save(a);
+ 				d2id = s.Save(d2);
+ 				t.Commit();
+ 			}
+ 
+ 			using( ISession s = sessions.OpenSession() )
+ 			using( ITransaction t = s.BeginTransaction() )
+ 			{
+ 				IList l = s.Find( "from E e, A a where e.Reverse = a.Forward and a = ?", a, NHibernateUtil.Entity (typeof(A)) );
+ 				Assert.AreEqual( 1, l.Count );
+ 				l = s.Find( "from E e join fetch e.Reverse" );
+ 				Assert.AreEqual( 2, l.Count );
+ 				t.Commit();
+ 			}
+ 
+ 			using( ISession s = sessions.OpenSession() )
+ 			using( ITransaction t = s.BeginTransaction() )
+ 			{
+ 				IList l = s.Find( "from E e" );
+ 				Assert.AreEqual( 2, l.Count );
+ 				E e = (E) l[ 0 ];
+ 				Assert.AreSame( e, e.Reverse.Forward );
+ 				e = (E) l[ 1 ];
+ 				Assert.AreSame( e, e.Reverse.Forward );
+ 				t.Commit();
+ 			}
+ 
+ 			using( ISession s = sessions.OpenSession() )
+ 			using( ITransaction t = s.BeginTransaction() )
+ 			{
+ 				a = (A) s.Load( typeof(A), aid );
+ 				d2 = (E) s.Load( typeof(E), d2id );
+ 				Assert.AreSame( a, a.Forward.Reverse );
+ 				Assert.AreSame( d2, d2.Reverse.Forward );
+ 				s.Delete( a );
+ 				s.Delete( a.Forward );
+ 				s.Delete( d2 );
+ 				s.Delete( d2.Reverse );
+ 				t.Commit();
+ 			}
+ 
+ 			using( ISession s = sessions.OpenSession() )
+ 			using( ITransaction t = s.BeginTransaction() )
+ 			{
+ 				IList l = s.Find( "from E e" );
+ 				Assert.AreEqual( 0, l.Count ); 
+ 				t.Commit();
+ 			}
+ 		}
  	}
  }

[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel E.cs,NONE,1.1 A.cs,1.4,1.5 ABCProxy.hbm.xml,1.7,1.8 Componentizable.hbm.xml,1.1,1.2 CustomPersister.cs,1.6,1.7 D.cs,1.3,1.4 Holder.cs,1.2,1.3 Holder.hbm.xml,1.3,1.4 NHibernate.DomainModel-1.1.csproj,1.31,1.32 Qux.cs,1.7,1.8 Qux.hbm.xml,1.8,1.9

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

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

Modified Files:
	A.cs ABCProxy.hbm.xml Componentizable.hbm.xml 
	CustomPersister.cs D.cs Holder.cs Holder.hbm.xml 
	NHibernate.DomainModel-1.1.csproj Qux.cs Qux.hbm.xml 
Added Files:
	E.cs 
Log Message:
Ported property-ref attribute implementation from Hibernate 2.1

Index: Holder.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Holder.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Holder.hbm.xml	3 Jun 2004 18:55:57 -0000	1.3
--- Holder.hbm.xml	26 Mar 2005 13:24:35 -0000	1.4
***************
*** 36,39 ****
--- 36,40 ----
  			/>
  		</set>
+ 		<many-to-one name="OtherHolder" property-ref="Name" cascade="all" />
  	</class>
  </hibernate-mapping>
\ No newline at end of file

Index: NHibernate.DomainModel-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel-1.1.csproj,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** NHibernate.DomainModel-1.1.csproj	21 Mar 2005 12:22:36 -0000	1.31
--- NHibernate.DomainModel-1.1.csproj	26 Mar 2005 13:24:35 -0000	1.32
***************
*** 185,193 ****
                  />
                  <File
-                     RelPath = "Child.cs"
-                     SubType = "Code"
-                     BuildAction = "Compile"
-                 />
-                 <File
                      RelPath = "Circular.cs"
                      SubType = "Code"
--- 185,188 ----
***************
*** 266,269 ****
--- 261,269 ----
                  />
                  <File
+                     RelPath = "E.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "Fee.cs"
                      SubType = "Code"
***************
*** 354,357 ****
--- 354,362 ----
                  />
                  <File
+                     RelPath = "Child.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "Immutable.cs"
                      SubType = "Code"
***************
*** 673,691 ****
                  />
                  <File
!                     RelPath = "NHSpecific\Child.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
!                     RelPath = "NHSpecific\Child.hbm.xml"
                      BuildAction = "EmbeddedResource"
                  />
                  <File
!                     RelPath = "NHSpecific\ClassWithNullColumns.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
!                     RelPath = "NHSpecific\ClassWithNullColumns.hbm.xml"
                      BuildAction = "EmbeddedResource"
                  />
--- 678,696 ----
                  />
                  <File
!                     RelPath = "NHSpecific\ClassWithNullColumns.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
!                     RelPath = "NHSpecific\ClassWithNullColumns.hbm.xml"
                      BuildAction = "EmbeddedResource"
                  />
                  <File
!                     RelPath = "NHSpecific\Child.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
!                     RelPath = "NHSpecific\Child.hbm.xml"
                      BuildAction = "EmbeddedResource"
                  />

Index: Qux.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Qux.hbm.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Qux.hbm.xml	16 Dec 2004 21:57:39 -0000	1.8
--- Qux.hbm.xml	26 Mar 2005 13:24:35 -0000	1.9
***************
*** 37,40 ****
--- 37,41 ----
  			/>
  		</list>
+ 		<many-to-one name="Holder" column="HOLDER_NAME" property-ref="Name" />
  	</class>
  </hibernate-mapping>
\ No newline at end of file

Index: Componentizable.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Componentizable.hbm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Componentizable.hbm.xml	21 Mar 2005 12:22:36 -0000	1.1
--- Componentizable.hbm.xml	26 Mar 2005 13:24:35 -0000	1.2
***************
*** 1,14 ****
  <?xml version="1.0" encoding="UTF-8"?>
! <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0" namespace="NHibernate.DomainModel" assembly="NHibernate.Test">
  	<class name="NHibernate.DomainModel.Componentizable">
! 		<id name="id">
  			<generator class="native"/>
  		</id>
! 		<property name="nickName"/>
! 		<component name="component" access="property" class="NHibernate.DomainModel.Component">
! 			<property name="name"/>
! 			<component name="subComponent" class="NHibernate.DomainModel.SubComponent">
! 				<property name="subName"/>
! 				<property name="subName1"/>
  			</component>
  		</component>
--- 1,14 ----
  <?xml version="1.0" encoding="UTF-8"?>
! <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0" namespace="NHibernate.DomainModel" assembly="NHibernate.DomainModel">
  	<class name="NHibernate.DomainModel.Componentizable">
! 		<id name="Id">
  			<generator class="native"/>
  		</id>
! 		<property name="NickName"/>
! 		<component name="Component" access="property" class="NHibernate.DomainModel.Component">
! 			<property name="Name"/>
! 			<component name="SubComponent" class="NHibernate.DomainModel.SubComponent">
! 				<property name="SubName"/>
! 				<property name="SubName1"/>
  			</component>
  		</component>

Index: CustomPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/CustomPersister.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CustomPersister.cs	14 Mar 2005 19:04:11 -0000	1.6
--- CustomPersister.cs	26 Mar 2005 13:24:35 -0000	1.7
***************
*** 177,180 ****
--- 177,185 ----
  		}
  
+ 		public object GetPropertyValue(object obj, string name)
+ 		{
+ 			return ( (Custom)obj).Name;
+ 		}
+ 
  		public bool IsVersioned
  		{
***************
*** 258,261 ****
--- 263,271 ----
  		}
  
+ 		public void SetPropertyValue(object obj, string name, object value)
+ 		{
+ 			( (Custom)obj).Name = (string)value;
+ 		}
+ 
  		public IType GetPropertyType( string propertyName )
  		{

Index: Qux.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Qux.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Qux.cs	9 Dec 2004 20:57:25 -0000	1.7
--- Qux.cs	26 Mar 2005 13:24:35 -0000	1.8
***************
*** 20,23 ****
--- 20,24 ----
  		private Qux _child;
  		private long _childKey;
+ 		private Holder _holder;
  
  		public Qux() { }
***************
*** 184,187 ****
--- 185,194 ----
  			set { _childKey = value; }
  		}
+ 
+ 		public virtual Holder Holder
+ 		{
+ 			get { return _holder; }
+ 			set { _holder = value; }
+ 		}
  	}
  }
\ No newline at end of file

Index: Holder.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Holder.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Holder.cs	18 Nov 2004 02:45:43 -0000	1.2
--- Holder.cs	26 Mar 2005 13:24:35 -0000	1.3
***************
*** 14,17 ****
--- 14,18 ----
  		private Iesi.Collections.ISet _foos;// <set> mapping
  		private string _name;
+ 		private Holder _otherHolder;
  
  		
***************
*** 40,43 ****
--- 41,50 ----
  		}
  		
+ 		public Holder OtherHolder
+ 		{
+ 			get { return _otherHolder; }
+ 			set { _otherHolder = value; }
+ 		}
+ 
  		#region INamed Members
  

--- NEW FILE: E.cs ---
using System;

namespace NHibernate.DomainModel
{
	/// <summary>
	/// POCO for E
	/// </summary>
	[Serializable]
	public class E
	{
		#region Fields
	
		private Int64 _id;
		private Double _amount;
		private A _reverse;
	
		#endregion

		#region Properties
		/// <summary>
		/// Get/set for id
		/// </summary>
		public virtual Int64 Id
		{
			get { return _id; }
			set { _id = value; }
		}
	
		/// <summary>
		/// Get/set for Amount
		/// </summary>
		public virtual Double Amount
		{
			get { return _amount; }
			set { _amount = value; }
		}

		public virtual A Reverse
		{
			get { return _reverse; }
			set { _reverse = value; }
		}

		#endregion
	}
}
Index: D.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/D.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** D.cs	9 Dec 2004 20:57:25 -0000	1.3
--- D.cs	26 Mar 2005 13:24:35 -0000	1.4
***************
*** 24,27 ****
--- 24,30 ----
  	public D()
  	{
+ 		// try to induce an infinite loop in the lazy-loading machinery
+ 		Amount = 100.0f;
+ 		Double a = Amount;
  	}
  	

Index: A.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/A.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** A.cs	9 Dec 2004 20:57:25 -0000	1.4
--- A.cs	26 Mar 2005 13:24:35 -0000	1.5
***************
*** 4,13 ****
  {
  
!  /// <summary>
!  /// POCO for A
!  /// </summary>
!  [Serializable]
!  public class A
!  {
  
  	#region Fields
--- 4,13 ----
  {
  
! /// <summary>
! /// POCO for A
! /// </summary>
! [Serializable]
! public class A
! {
  
  	#region Fields
***************
*** 21,25 ****
  	/// </summary>
  	private String _name;
! 	
  	#endregion
  
--- 21,29 ----
  	/// </summary>
  	private String _name;
! 
! 	/// <summary>
! 	/// Holder for forward
! 	/// </summary>
! 	private E _forward;
  	#endregion
  
***************
*** 61,65 ****
  		set { _name = value; }
  	}
! 	
  	#endregion
   }
--- 65,75 ----
  		set { _name = value; }
  	}
! 
! 	public virtual E Forward
! 	{
! 		get { return _forward; }
! 		set { _forward = value; }
! 	}
! 
  	#endregion
   }

Index: ABCProxy.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/ABCProxy.hbm.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ABCProxy.hbm.xml	16 Dec 2004 21:57:39 -0000	1.7
--- ABCProxy.hbm.xml	26 Mar 2005 13:24:35 -0000	1.8
***************
*** 11,14 ****
--- 11,15 ----
  		<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" 
***************
*** 49,51 ****
--- 50,65 ----
  		<property name="Amount" type="Double" />
  	</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>
+ 
  </hibernate-mapping>
\ No newline at end of file

[Nhibernate-commit] nhibernate/src/NHibernate nhibernate-mapping-2.0.xsd,1.10,1.11

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

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

Modified Files:
	nhibernate-mapping-2.0.xsd 
Log Message:
Ported property-ref attribute implementation from Hibernate 2.1

Index: nhibernate-mapping-2.0.xsd
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/nhibernate-mapping-2.0.xsd,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** nhibernate-mapping-2.0.xsd	26 Mar 2005 12:15:01 -0000	1.10
--- nhibernate-mapping-2.0.xsd	26 Mar 2005 13:24:38 -0000	1.11
***************
*** 623,626 ****
--- 623,627 ----
  			<xs:attribute name="update" type="xs:boolean" default="true"/>
  			<xs:attribute name="insert" type="xs:boolean" default="true"/>
+ 			<xs:attribute name="property-ref" type="xs:string"/>
  		</xs:complexType>
  	</xs:element>
***************
*** 662,665 ****
--- 663,667 ----
  			<xs:attribute name="outer-join" type="outerJoinStrategy" default="auto"/>
  			<xs:attribute name="constrained" type="xs:boolean" default="false"/>
+ 			<xs:attribute name="property-ref" type="xs:string"/>
  		</xs:complexType>
  	</xs:element>

[Nhibernate-commit] nhibernate/src/NHibernate/Mapping ManyToOne.cs,1.6,1.7 OneToOne.cs,1.6,1.7

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

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

Modified Files:
	ManyToOne.cs OneToOne.cs 
Log Message:
Ported property-ref attribute implementation from Hibernate 2.1

Index: OneToOne.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Mapping/OneToOne.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** OneToOne.cs	14 Mar 2005 14:36:26 -0000	1.6
--- OneToOne.cs	26 Mar 2005 13:24:36 -0000	1.7
***************
*** 46,51 ****
  		public override void CreateForeignKey()
  		{
! 			//if( constrained && ReferencedPropertyName == null )
! 			if( constrained )
  			{
  				// TODO: 2.1+ handle the case of a foreign key to something other than the pk
--- 46,51 ----
  		public override void CreateForeignKey()
  		{
! 			if( constrained && ReferencedPropertyName == null )
! 			//if( constrained )
  			{
  				// TODO: 2.1+ handle the case of a foreign key to something other than the pk

Index: ManyToOne.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Mapping/ManyToOne.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ManyToOne.cs	14 Mar 2005 14:36:26 -0000	1.6
--- ManyToOne.cs	26 Mar 2005 13:24:36 -0000	1.7
***************
*** 27,31 ****
  				if( Type == null )
  				{
! 					Type = TypeFactory.ManyToOne( ReflectHelper.GetGetter( propertyClass, propertyName, propertyAccess ).ReturnType );
  				}
  			}
--- 27,33 ----
  				if( Type == null )
  				{
! 					Type = TypeFactory.ManyToOne(
! 						ReflectHelper.ReflectedPropertyClass( propertyClass, propertyName ),
! 						ReferencedPropertyName);
  				}
  			}