nhibernate-commit

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

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

Modified Files:
	CultureInfoType.cs ObjectType.cs SerializableType.cs 
	TypeFactory.cs TypeType.cs 
Log Message:
Renamed NHibernate.NHibernate to NHibernate.NHibernateUtil.

Index: CultureInfoType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/CultureInfoType.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CultureInfoType.cs	31 Dec 2004 23:51:32 -0000	1.5
--- CultureInfoType.cs	17 Jan 2005 03:40:58 -0000	1.6
***************
*** 28,32 ****
  		public override object Get( IDataReader rs, int index )
  		{
! 			string str = ( string ) NHibernate.String.Get( rs, index );
  			if( str == null )
  			{
--- 28,32 ----
  		public override object Get( IDataReader rs, int index )
  		{
! 			string str = ( string ) NHibernateUtil.String.Get( rs, index );
  			if( str == null )
  			{
***************
*** 58,62 ****
  		public override void Set( IDbCommand cmd, object value, int index )
  		{
! 			NHibernate.String.Set( cmd, ( ( CultureInfo ) value ).Name, index );
  		}
  
--- 58,62 ----
  		public override void Set( IDbCommand cmd, object value, int index )
  		{
! 			NHibernateUtil.String.Set( cmd, ( ( CultureInfo ) value ).Name, index );
  		}
  
***************
*** 101,105 ****
  		public string ObjectToSQLString( object value )
  		{
! 			return ( ( ILiteralType ) NHibernate.String ).ObjectToSQLString( value.ToString() );
  		}
  	}
--- 101,105 ----
  		public string ObjectToSQLString( object value )
  		{
! 			return ( ( ILiteralType ) NHibernateUtil.String ).ObjectToSQLString( value.ToString() );
  		}
  	}

Index: SerializableType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/SerializableType.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SerializableType.cs	31 Dec 2004 23:55:34 -0000	1.7
--- SerializableType.cs	17 Jan 2005 03:40:58 -0000	1.8
***************
*** 41,45 ****
  		{
  			this.serializableClass = serializableClass;
! 			this.binaryType = ( BinaryType ) NHibernate.Binary;
  
  		}
--- 41,45 ----
  		{
  			this.serializableClass = serializableClass;
! 			this.binaryType = ( BinaryType ) NHibernateUtil.Binary;
  
  		}

Index: TypeType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/TypeType.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TypeType.cs	1 Jan 2005 03:37:34 -0000	1.6
--- TypeType.cs	17 Jan 2005 03:40:58 -0000	1.7
***************
*** 1,4 ****
--- 1,5 ----
  using System;
  using System.Data;
+ using NHibernate;
  using NHibernate.SqlTypes;
  using NHibernate.Util;
***************
*** 37,41 ****
  		public override object Get( IDataReader rs, int index )
  		{
! 			string str = ( string ) NHibernate.String.Get( rs, index );
  			if( str == null )
  			{
--- 38,42 ----
  		public override object Get( IDataReader rs, int index )
  		{
! 			string str = ( string ) NHibernateUtil.String.Get( rs, index );
  			if( str == null )
  			{
***************
*** 85,93 ****
  		/// <remarks>
  		/// This uses the <see cref="NullableType.Set(IDbCommand, Object,Int32)"/> method of the 
! 		/// <see cref="NHibernate.String"/> object to do the work.
  		/// </remarks>
  		public override void Set( IDbCommand cmd, object value, int index )
  		{
! 			NHibernate.String.Set( cmd, ( ( System.Type ) value ).AssemblyQualifiedName, index );
  		}
  
--- 86,94 ----
  		/// <remarks>
  		/// This uses the <see cref="NullableType.Set(IDbCommand, Object,Int32)"/> method of the 
! 		/// <see cref="NHibernateUtil.String"/> object to do the work.
  		/// </remarks>
  		public override void Set( IDbCommand cmd, object value, int index )
  		{
! 			NHibernateUtil.String.Set( cmd, ( ( System.Type ) value ).AssemblyQualifiedName, index );
  		}
  

Index: TypeFactory.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/TypeFactory.cs,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** TypeFactory.cs	31 Dec 2004 23:56:09 -0000	1.41
--- TypeFactory.cs	17 Jan 2005 03:40:58 -0000	1.42
***************
*** 74,183 ****
  
  			// set up the mappings of .NET Classes/Structs to their NHibernate types.
! 			typeByTypeOfName[ typeof( Byte[ ] ).Name ] = NHibernate.Binary;
! 			typeByTypeOfName[ typeof( Byte[ ] ).AssemblyQualifiedName ] = NHibernate.Binary;
! 			typeByTypeOfName[ typeof( Boolean ).FullName ] = NHibernate.Boolean;
! 			typeByTypeOfName[ typeof( Boolean ).AssemblyQualifiedName ] = NHibernate.Boolean;
! 			typeByTypeOfName[ typeof( Byte ).FullName ] = NHibernate.Byte;
! 			typeByTypeOfName[ typeof( Byte ).AssemblyQualifiedName ] = NHibernate.Byte;
! 			typeByTypeOfName[ typeof( Char ).FullName ] = NHibernate.Character;
! 			typeByTypeOfName[ typeof( Char ).AssemblyQualifiedName ] = NHibernate.Character;
! 			typeByTypeOfName[ typeof( CultureInfo ).FullName ] = NHibernate.CultureInfo;
! 			typeByTypeOfName[ typeof( CultureInfo ).AssemblyQualifiedName ] = NHibernate.CultureInfo;
! 			typeByTypeOfName[ typeof( DateTime ).FullName ] = NHibernate.DateTime;
! 			typeByTypeOfName[ typeof( DateTime ).AssemblyQualifiedName ] = NHibernate.DateTime;
! 			typeByTypeOfName[ typeof( Decimal ).FullName ] = NHibernate.Decimal;
! 			typeByTypeOfName[ typeof( Decimal ).AssemblyQualifiedName ] = NHibernate.Decimal;
! 			typeByTypeOfName[ typeof( Double ).FullName ] = NHibernate.Double;
! 			typeByTypeOfName[ typeof( Double ).AssemblyQualifiedName ] = NHibernate.Double;
! 			typeByTypeOfName[ typeof( Guid ).FullName ] = NHibernate.Guid;
! 			typeByTypeOfName[ typeof( Guid ).AssemblyQualifiedName ] = NHibernate.Guid;
! 			typeByTypeOfName[ typeof( Int16 ).FullName ] = NHibernate.Int16;
! 			typeByTypeOfName[ typeof( Int16 ).AssemblyQualifiedName ] = NHibernate.Int16;
! 			typeByTypeOfName[ typeof( Int32 ).FullName ] = NHibernate.Int32;
! 			typeByTypeOfName[ typeof( Int32 ).AssemblyQualifiedName ] = NHibernate.Int32;
! 			typeByTypeOfName[ typeof( Int64 ).FullName ] = NHibernate.Int64;
! 			typeByTypeOfName[ typeof( Int64 ).AssemblyQualifiedName ] = NHibernate.Int64;
! 			typeByTypeOfName[ typeof( SByte ).FullName ] = NHibernate.SByte;
! 			typeByTypeOfName[ typeof( SByte ).AssemblyQualifiedName ] = NHibernate.SByte;
! 			typeByTypeOfName[ typeof( Single ).FullName ] = NHibernate.Single;
! 			typeByTypeOfName[ typeof( Single ).AssemblyQualifiedName ] = NHibernate.Single;
! 			typeByTypeOfName[ typeof( String ).FullName ] = NHibernate.String;
! 			typeByTypeOfName[ typeof( String ).AssemblyQualifiedName ] = NHibernate.String;
! 			typeByTypeOfName[ typeof( TimeSpan ).FullName ] = NHibernate.TimeSpan;
! 			typeByTypeOfName[ typeof( TimeSpan ).AssemblyQualifiedName ] = NHibernate.TimeSpan;
  
  			// add the mappings of the NHibernate specific names that are used in type=""
! 			typeByTypeOfName[ NHibernate.AnsiString.Name ] = NHibernate.AnsiString;
! 			typeByTypeOfName[ NHibernate.Binary.Name ] = NHibernate.Binary;
! 			typeByTypeOfName[ NHibernate.BinaryBlob.Name ] = NHibernate.BinaryBlob;
! 			typeByTypeOfName[ NHibernate.Boolean.Name ] = NHibernate.Boolean;
! 			typeByTypeOfName[ NHibernate.Byte.Name ] = NHibernate.Byte;
! 			typeByTypeOfName[ NHibernate.Character.Name ] = NHibernate.Character;
! 			typeByTypeOfName[ NHibernate.StringClob.Name ] = NHibernate.StringClob;
! 			typeByTypeOfName[ NHibernate.CultureInfo.Name ] = NHibernate.CultureInfo;
! 			typeByTypeOfName[ NHibernate.DateTime.Name ] = NHibernate.DateTime;
! 			typeByTypeOfName[ NHibernate.Date.Name ] = NHibernate.Date;
! 			typeByTypeOfName[ NHibernate.Decimal.Name ] = NHibernate.Decimal;
! 			typeByTypeOfName[ NHibernate.Double.Name ] = NHibernate.Double;
! 			typeByTypeOfName[ NHibernate.Guid.Name ] = NHibernate.Guid;
! 			typeByTypeOfName[ NHibernate.Int16.Name ] = NHibernate.Int16;
! 			typeByTypeOfName[ NHibernate.Int32.Name ] = NHibernate.Int32;
! 			typeByTypeOfName[ NHibernate.Int64.Name ] = NHibernate.Int64;
! 			typeByTypeOfName[ NHibernate.SByte.Name ] = NHibernate.SByte;
! 			typeByTypeOfName[ NHibernate.String.Name ] = NHibernate.String;
! 			typeByTypeOfName[ NHibernate.Single.Name ] = NHibernate.Single;
! 			typeByTypeOfName[ NHibernate.Timestamp.Name ] = NHibernate.Timestamp;
! 			typeByTypeOfName[ NHibernate.Time.Name ] = NHibernate.Time;
! 			typeByTypeOfName[ NHibernate.TrueFalse.Name ] = NHibernate.TrueFalse;
! 			typeByTypeOfName[ NHibernate.YesNo.Name ] = NHibernate.YesNo;
! 			typeByTypeOfName[ NHibernate.Ticks.Name ] = NHibernate.Ticks;
! 			typeByTypeOfName[ NHibernate.TimeSpan.Name ] = NHibernate.TimeSpan;
  
! 			typeByTypeOfName[ NHibernate.Class.Name ] = NHibernate.Class;
! 			typeByTypeOfName[ typeof( System.Type ).FullName ] = NHibernate.Class;
! 			typeByTypeOfName[ typeof( System.Type ).AssemblyQualifiedName ] = NHibernate.Class;
  
  			// need to do add the key "Serializable" because the hbm files will have a 
  			// type="Serializable", but the SerializableType returns the Name as 
  			// "serializable - System.Object for the default SerializableType.
! 			typeByTypeOfName[ "Serializable" ] = NHibernate.Serializable;
! 			typeByTypeOfName[ NHibernate.Serializable.Name ] = NHibernate.Serializable;
  
  			// object needs to have both class and serializable setup before it can
  			// be created.
! 			typeByTypeOfName[ typeof( Object ).FullName ] = NHibernate.Object;
! 			typeByTypeOfName[ typeof( Object ).AssemblyQualifiedName ] = NHibernate.Object;
! 			typeByTypeOfName[ NHibernate.Object.Name ] = NHibernate.Object;
  
  			// These are in here for Hibernate mapping compatibility
! 			typeByTypeOfName[ "binary" ] = NHibernate.Binary;
! 			typeByTypeOfName[ "boolean" ] = NHibernate.Boolean;
! 			typeByTypeOfName[ "byte" ] = NHibernate.Byte;
! 			typeByTypeOfName[ "character" ] = NHibernate.Character;
! 			typeByTypeOfName[ "class" ] = NHibernate.Class;
! 			typeByTypeOfName[ "locale" ] = NHibernate.CultureInfo;
! 			typeByTypeOfName[ "date" ] = NHibernate.DateTime;
! 			typeByTypeOfName[ "big_decimal" ] = NHibernate.Decimal;
! 			typeByTypeOfName[ "double" ] = NHibernate.Double;
! 			typeByTypeOfName[ "short" ] = NHibernate.Int16;
! 			typeByTypeOfName[ "integer" ] = NHibernate.Int32;
! 			typeByTypeOfName[ "long" ] = NHibernate.Int64;
! 			typeByTypeOfName[ "float" ] = NHibernate.Single;
! 			typeByTypeOfName[ "serializable" ] = NHibernate.Serializable;
! 			typeByTypeOfName[ "string" ] = NHibernate.String;
! 			typeByTypeOfName[ "timestamp" ] = NHibernate.Timestamp;
! 			typeByTypeOfName[ "time" ] = NHibernate.Time;
! 			typeByTypeOfName[ "true_false" ] = NHibernate.TrueFalse;
! 			typeByTypeOfName[ "yes_no" ] = NHibernate.YesNo;
! 			typeByTypeOfName[ "object" ] = NHibernate.Object;
  
  
! 			getTypeDelegatesWithLength.Add( NHibernate.AnsiString.Name, new GetNullableTypeWithLength( GetAnsiStringType ) );
! 			getTypeDelegatesWithLength.Add( NHibernate.Binary.Name, new GetNullableTypeWithLength( GetBinaryType ) );
! 			getTypeDelegatesWithLength.Add( NHibernate.Serializable.Name, new GetNullableTypeWithLength( GetSerializableType ) );
! 			getTypeDelegatesWithLength.Add( NHibernate.String.Name, new GetNullableTypeWithLength( GetStringType ) );
! 			getTypeDelegatesWithLength.Add( NHibernate.Class.Name, new GetNullableTypeWithLength( GetTypeType ) );
  
! 			getTypeDelegatesWithPrecision.Add( NHibernate.Decimal.Name, new GetNullableTypeWithPrecision( GetDecimalType ) );
  
  		}
--- 74,183 ----
  
  			// set up the mappings of .NET Classes/Structs to their NHibernate types.
! 			typeByTypeOfName[ typeof( Byte[ ] ).Name ] = NHibernateUtil.Binary;
! 			typeByTypeOfName[ typeof( Byte[ ] ).AssemblyQualifiedName ] = NHibernateUtil.Binary;
! 			typeByTypeOfName[ typeof( Boolean ).FullName ] = NHibernateUtil.Boolean;
! 			typeByTypeOfName[ typeof( Boolean ).AssemblyQualifiedName ] = NHibernateUtil.Boolean;
! 			typeByTypeOfName[ typeof( Byte ).FullName ] = NHibernateUtil.Byte;
! 			typeByTypeOfName[ typeof( Byte ).AssemblyQualifiedName ] = NHibernateUtil.Byte;
! 			typeByTypeOfName[ typeof( Char ).FullName ] = NHibernateUtil.Character;
! 			typeByTypeOfName[ typeof( Char ).AssemblyQualifiedName ] = NHibernateUtil.Character;
! 			typeByTypeOfName[ typeof( CultureInfo ).FullName ] = NHibernateUtil.CultureInfo;
! 			typeByTypeOfName[ typeof( CultureInfo ).AssemblyQualifiedName ] = NHibernateUtil.CultureInfo;
! 			typeByTypeOfName[ typeof( DateTime ).FullName ] = NHibernateUtil.DateTime;
! 			typeByTypeOfName[ typeof( DateTime ).AssemblyQualifiedName ] = NHibernateUtil.DateTime;
! 			typeByTypeOfName[ typeof( Decimal ).FullName ] = NHibernateUtil.Decimal;
! 			typeByTypeOfName[ typeof( Decimal ).AssemblyQualifiedName ] = NHibernateUtil.Decimal;
! 			typeByTypeOfName[ typeof( Double ).FullName ] = NHibernateUtil.Double;
! 			typeByTypeOfName[ typeof( Double ).AssemblyQualifiedName ] = NHibernateUtil.Double;
! 			typeByTypeOfName[ typeof( Guid ).FullName ] = NHibernateUtil.Guid;
! 			typeByTypeOfName[ typeof( Guid ).AssemblyQualifiedName ] = NHibernateUtil.Guid;
! 			typeByTypeOfName[ typeof( Int16 ).FullName ] = NHibernateUtil.Int16;
! 			typeByTypeOfName[ typeof( Int16 ).AssemblyQualifiedName ] = NHibernateUtil.Int16;
! 			typeByTypeOfName[ typeof( Int32 ).FullName ] = NHibernateUtil.Int32;
! 			typeByTypeOfName[ typeof( Int32 ).AssemblyQualifiedName ] = NHibernateUtil.Int32;
! 			typeByTypeOfName[ typeof( Int64 ).FullName ] = NHibernateUtil.Int64;
! 			typeByTypeOfName[ typeof( Int64 ).AssemblyQualifiedName ] = NHibernateUtil.Int64;
! 			typeByTypeOfName[ typeof( SByte ).FullName ] = NHibernateUtil.SByte;
! 			typeByTypeOfName[ typeof( SByte ).AssemblyQualifiedName ] = NHibernateUtil.SByte;
! 			typeByTypeOfName[ typeof( Single ).FullName ] = NHibernateUtil.Single;
! 			typeByTypeOfName[ typeof( Single ).AssemblyQualifiedName ] = NHibernateUtil.Single;
! 			typeByTypeOfName[ typeof( String ).FullName ] = NHibernateUtil.String;
! 			typeByTypeOfName[ typeof( String ).AssemblyQualifiedName ] = NHibernateUtil.String;
! 			typeByTypeOfName[ typeof( TimeSpan ).FullName ] = NHibernateUtil.TimeSpan;
! 			typeByTypeOfName[ typeof( TimeSpan ).AssemblyQualifiedName ] = NHibernateUtil.TimeSpan;
  
  			// add the mappings of the NHibernate specific names that are used in type=""
! 			typeByTypeOfName[ NHibernateUtil.AnsiString.Name ] = NHibernateUtil.AnsiString;
! 			typeByTypeOfName[ NHibernateUtil.Binary.Name ] = NHibernateUtil.Binary;
! 			typeByTypeOfName[ NHibernateUtil.BinaryBlob.Name ] = NHibernateUtil.BinaryBlob;
! 			typeByTypeOfName[ NHibernateUtil.Boolean.Name ] = NHibernateUtil.Boolean;
! 			typeByTypeOfName[ NHibernateUtil.Byte.Name ] = NHibernateUtil.Byte;
! 			typeByTypeOfName[ NHibernateUtil.Character.Name ] = NHibernateUtil.Character;
! 			typeByTypeOfName[ NHibernateUtil.StringClob.Name ] = NHibernateUtil.StringClob;
! 			typeByTypeOfName[ NHibernateUtil.CultureInfo.Name ] = NHibernateUtil.CultureInfo;
! 			typeByTypeOfName[ NHibernateUtil.DateTime.Name ] = NHibernateUtil.DateTime;
! 			typeByTypeOfName[ NHibernateUtil.Date.Name ] = NHibernateUtil.Date;
! 			typeByTypeOfName[ NHibernateUtil.Decimal.Name ] = NHibernateUtil.Decimal;
! 			typeByTypeOfName[ NHibernateUtil.Double.Name ] = NHibernateUtil.Double;
! 			typeByTypeOfName[ NHibernateUtil.Guid.Name ] = NHibernateUtil.Guid;
! 			typeByTypeOfName[ NHibernateUtil.Int16.Name ] = NHibernateUtil.Int16;
! 			typeByTypeOfName[ NHibernateUtil.Int32.Name ] = NHibernateUtil.Int32;
! 			typeByTypeOfName[ NHibernateUtil.Int64.Name ] = NHibernateUtil.Int64;
! 			typeByTypeOfName[ NHibernateUtil.SByte.Name ] = NHibernateUtil.SByte;
! 			typeByTypeOfName[ NHibernateUtil.String.Name ] = NHibernateUtil.String;
! 			typeByTypeOfName[ NHibernateUtil.Single.Name ] = NHibernateUtil.Single;
! 			typeByTypeOfName[ NHibernateUtil.Timestamp.Name ] = NHibernateUtil.Timestamp;
! 			typeByTypeOfName[ NHibernateUtil.Time.Name ] = NHibernateUtil.Time;
! 			typeByTypeOfName[ NHibernateUtil.TrueFalse.Name ] = NHibernateUtil.TrueFalse;
! 			typeByTypeOfName[ NHibernateUtil.YesNo.Name ] = NHibernateUtil.YesNo;
! 			typeByTypeOfName[ NHibernateUtil.Ticks.Name ] = NHibernateUtil.Ticks;
! 			typeByTypeOfName[ NHibernateUtil.TimeSpan.Name ] = NHibernateUtil.TimeSpan;
  
! 			typeByTypeOfName[ NHibernateUtil.Class.Name ] = NHibernateUtil.Class;
! 			typeByTypeOfName[ typeof( System.Type ).FullName ] = NHibernateUtil.Class;
! 			typeByTypeOfName[ typeof( System.Type ).AssemblyQualifiedName ] = NHibernateUtil.Class;
  
  			// need to do add the key "Serializable" because the hbm files will have a 
  			// type="Serializable", but the SerializableType returns the Name as 
  			// "serializable - System.Object for the default SerializableType.
! 			typeByTypeOfName[ "Serializable" ] = NHibernateUtil.Serializable;
! 			typeByTypeOfName[ NHibernateUtil.Serializable.Name ] = NHibernateUtil.Serializable;
  
  			// object needs to have both class and serializable setup before it can
  			// be created.
! 			typeByTypeOfName[ typeof( Object ).FullName ] = NHibernateUtil.Object;
! 			typeByTypeOfName[ typeof( Object ).AssemblyQualifiedName ] = NHibernateUtil.Object;
! 			typeByTypeOfName[ NHibernateUtil.Object.Name ] = NHibernateUtil.Object;
  
  			// These are in here for Hibernate mapping compatibility
! 			typeByTypeOfName[ "binary" ] = NHibernateUtil.Binary;
! 			typeByTypeOfName[ "boolean" ] = NHibernateUtil.Boolean;
! 			typeByTypeOfName[ "byte" ] = NHibernateUtil.Byte;
! 			typeByTypeOfName[ "character" ] = NHibernateUtil.Character;
! 			typeByTypeOfName[ "class" ] = NHibernateUtil.Class;
! 			typeByTypeOfName[ "locale" ] = NHibernateUtil.CultureInfo;
! 			typeByTypeOfName[ "date" ] = NHibernateUtil.DateTime;
! 			typeByTypeOfName[ "big_decimal" ] = NHibernateUtil.Decimal;
! 			typeByTypeOfName[ "double" ] = NHibernateUtil.Double;
! 			typeByTypeOfName[ "short" ] = NHibernateUtil.Int16;
! 			typeByTypeOfName[ "integer" ] = NHibernateUtil.Int32;
! 			typeByTypeOfName[ "long" ] = NHibernateUtil.Int64;
! 			typeByTypeOfName[ "float" ] = NHibernateUtil.Single;
! 			typeByTypeOfName[ "serializable" ] = NHibernateUtil.Serializable;
! 			typeByTypeOfName[ "string" ] = NHibernateUtil.String;
! 			typeByTypeOfName[ "timestamp" ] = NHibernateUtil.Timestamp;
! 			typeByTypeOfName[ "time" ] = NHibernateUtil.Time;
! 			typeByTypeOfName[ "true_false" ] = NHibernateUtil.TrueFalse;
! 			typeByTypeOfName[ "yes_no" ] = NHibernateUtil.YesNo;
! 			typeByTypeOfName[ "object" ] = NHibernateUtil.Object;
  
  
! 			getTypeDelegatesWithLength.Add( NHibernateUtil.AnsiString.Name, new GetNullableTypeWithLength( GetAnsiStringType ) );
! 			getTypeDelegatesWithLength.Add( NHibernateUtil.Binary.Name, new GetNullableTypeWithLength( GetBinaryType ) );
! 			getTypeDelegatesWithLength.Add( NHibernateUtil.Serializable.Name, new GetNullableTypeWithLength( GetSerializableType ) );
! 			getTypeDelegatesWithLength.Add( NHibernateUtil.String.Name, new GetNullableTypeWithLength( GetStringType ) );
! 			getTypeDelegatesWithLength.Add( NHibernateUtil.Class.Name, new GetNullableTypeWithLength( GetTypeType ) );
  
! 			getTypeDelegatesWithPrecision.Add( NHibernateUtil.Decimal.Name, new GetNullableTypeWithPrecision( GetDecimalType ) );
  
  		}
***************
*** 456,464 ****
  					else if( typeof( ILifecycle ).IsAssignableFrom( typeClass ) )
  					{
! 						type = NHibernate.Entity( typeClass );
  					}
  					else if( typeClass.IsEnum )
  					{
! 						type = NHibernate.Enum( typeClass );
  					}
  					else if( typeClass.IsSerializable )
--- 456,464 ----
  					else if( typeof( ILifecycle ).IsAssignableFrom( typeClass ) )
  					{
! 						type = NHibernateUtil.Entity( typeClass );
  					}
  					else if( typeClass.IsEnum )
  					{
! 						type = NHibernateUtil.Enum( typeClass );
  					}
  					else if( typeClass.IsSerializable )
***************
*** 481,485 ****
  		public static NullableType GetAnsiStringType()
  		{
! 			return NHibernate.AnsiString;
  		}
  
--- 481,485 ----
  		public static NullableType GetAnsiStringType()
  		{
! 			return NHibernateUtil.AnsiString;
  		}
  
***************
*** 491,495 ****
  		public static NullableType GetAnsiStringType( int length )
  		{
! 			string key = GetKeyForLengthBased( NHibernate.AnsiString.Name, length );
  
  			NullableType returnType = ( NullableType ) typeByTypeOfName[ key ];
--- 491,495 ----
  		public static NullableType GetAnsiStringType( int length )
  		{
! 			string key = GetKeyForLengthBased( NHibernateUtil.AnsiString.Name, length );
  
  			NullableType returnType = ( NullableType ) typeByTypeOfName[ key ];
***************
*** 520,524 ****
  		public static NullableType GetBinaryType()
  		{
! 			return NHibernate.Binary;
  		}
  
--- 520,524 ----
  		public static NullableType GetBinaryType()
  		{
! 			return NHibernateUtil.Binary;
  		}
  
***************
*** 538,545 ****
  			if( length == 0 )
  			{
! 				return NHibernate.Binary;
  			}
  
! 			string key = GetKeyForLengthBased( NHibernate.Binary.Name, length );
  			NullableType returnType = ( NullableType ) typeByTypeOfName[ key ];
  			if( returnType == null )
--- 538,545 ----
  			if( length == 0 )
  			{
! 				return NHibernateUtil.Binary;
  			}
  
! 			string key = GetKeyForLengthBased( NHibernateUtil.Binary.Name, length );
  			NullableType returnType = ( NullableType ) typeByTypeOfName[ key ];
  			if( returnType == null )
***************
*** 559,563 ****
  		public static NullableType GetBooleanType()
  		{
! 			return NHibernate.Boolean;
  		}
  
--- 559,563 ----
  		public static NullableType GetBooleanType()
  		{
! 			return NHibernateUtil.Boolean;
  		}
  
***************
*** 568,572 ****
  		public static NullableType GetByteType()
  		{
! 			return NHibernate.Byte;
  		}
  
--- 568,572 ----
  		public static NullableType GetByteType()
  		{
! 			return NHibernateUtil.Byte;
  		}
  
***************
*** 577,581 ****
  		public static NullableType GetCharType()
  		{
! 			return NHibernate.Character;
  		}
  
--- 577,581 ----
  		public static NullableType GetCharType()
  		{
! 			return NHibernateUtil.Character;
  		}
  
***************
*** 586,590 ****
  		public static NullableType GetCultureInfoType()
  		{
! 			return NHibernate.CultureInfo;
  		}
  
--- 586,590 ----
  		public static NullableType GetCultureInfoType()
  		{
! 			return NHibernateUtil.CultureInfo;
  		}
  
***************
*** 595,599 ****
  		public static NullableType GetDateTimeType()
  		{
! 			return NHibernate.DateTime;
  		}
  
--- 595,599 ----
  		public static NullableType GetDateTimeType()
  		{
! 			return NHibernateUtil.DateTime;
  		}
  
***************
*** 604,608 ****
  		public static NullableType GetDateType()
  		{
! 			return NHibernate.Date;
  		}
  
--- 604,608 ----
  		public static NullableType GetDateType()
  		{
! 			return NHibernateUtil.Date;
  		}
  
***************
*** 614,618 ****
  		public static NullableType GetDecimalType()
  		{
! 			return NHibernate.Decimal;
  		}
  
--- 614,618 ----
  		public static NullableType GetDecimalType()
  		{
! 			return NHibernateUtil.Decimal;
  		}
  
***************
*** 625,629 ****
  		public static NullableType GetDecimalType( byte precision, byte scale )
  		{
! 			string key = GetKeyForPrecisionScaleBased( NHibernate.Decimal.Name, precision, scale );
  			NullableType returnType = ( NullableType ) typeByTypeOfName[ key ];
  			if( returnType == null )
--- 625,629 ----
  		public static NullableType GetDecimalType( byte precision, byte scale )
  		{
! 			string key = GetKeyForPrecisionScaleBased( NHibernateUtil.Decimal.Name, precision, scale );
  			NullableType returnType = ( NullableType ) typeByTypeOfName[ key ];
  			if( returnType == null )
***************
*** 643,647 ****
  		public static NullableType GetDoubleType()
  		{
! 			return NHibernate.Double;
  		}
  
--- 643,647 ----
  		public static NullableType GetDoubleType()
  		{
! 			return NHibernateUtil.Double;
  		}
  
***************
*** 652,656 ****
  		public static NullableType GetGuidType()
  		{
! 			return NHibernate.Guid;
  		}
  
--- 652,656 ----
  		public static NullableType GetGuidType()
  		{
! 			return NHibernateUtil.Guid;
  		}
  
***************
*** 661,665 ****
  		public static NullableType GetInt16Type()
  		{
! 			return NHibernate.Int16;
  		}
  
--- 661,665 ----
  		public static NullableType GetInt16Type()
  		{
! 			return NHibernateUtil.Int16;
  		}
  
***************
*** 670,674 ****
  		public static NullableType GetInt32Type()
  		{
! 			return NHibernate.Int32;
  		}
  
--- 670,674 ----
  		public static NullableType GetInt32Type()
  		{
! 			return NHibernateUtil.Int32;
  		}
  
***************
*** 679,683 ****
  		public static NullableType GetInt64Type()
  		{
! 			return NHibernate.Int64;
  		}
  
--- 679,683 ----
  		public static NullableType GetInt64Type()
  		{
! 			return NHibernateUtil.Int64;
  		}
  
***************
*** 688,692 ****
  		public static IType GetObjectType()
  		{
! 			return NHibernate.Object;
  		}
  
--- 688,692 ----
  		public static IType GetObjectType()
  		{
! 			return NHibernateUtil.Object;
  		}
  
***************
*** 697,701 ****
  		public static NullableType GetSingleType()
  		{
! 			return NHibernate.Single;
  		}
  
--- 697,701 ----
  		public static NullableType GetSingleType()
  		{
! 			return NHibernateUtil.Single;
  		}
  
***************
*** 706,710 ****
  		public static NullableType GetSerializableType()
  		{
! 			return NHibernate.Serializable;
  
  		}
--- 706,710 ----
  		public static NullableType GetSerializableType()
  		{
! 			return NHibernateUtil.Serializable;
  
  		}
***************
*** 772,776 ****
  		public static NullableType GetSerializableType( int length )
  		{
! 			string key = GetKeyForLengthBased( NHibernate.Serializable.Name, length );
  
  			NullableType returnType = ( NullableType ) typeByTypeOfName[ key ];
--- 772,776 ----
  		public static NullableType GetSerializableType( int length )
  		{
! 			string key = GetKeyForLengthBased( NHibernateUtil.Serializable.Name, length );
  
  			NullableType returnType = ( NullableType ) typeByTypeOfName[ key ];
***************
*** 791,795 ****
  		public static NullableType GetStringType()
  		{
! 			return NHibernate.String;
  		}
  
--- 791,795 ----
  		public static NullableType GetStringType()
  		{
! 			return NHibernateUtil.String;
  		}
  
***************
*** 801,805 ****
  		public static NullableType GetStringType( int length )
  		{
! 			string key = GetKeyForLengthBased( NHibernate.String.Name, length );
  
  			NullableType returnType = ( NullableType ) typeByTypeOfName[ key ];
--- 801,805 ----
  		public static NullableType GetStringType( int length )
  		{
! 			string key = GetKeyForLengthBased( NHibernateUtil.String.Name, length );
  
  			NullableType returnType = ( NullableType ) typeByTypeOfName[ key ];
***************
*** 820,824 ****
  		public static NullableType GetTicksType()
  		{
! 			return NHibernate.Ticks;
  		}
  
--- 820,824 ----
  		public static NullableType GetTicksType()
  		{
! 			return NHibernateUtil.Ticks;
  		}
  
***************
*** 829,833 ****
  		public static NullableType GetTimeSpanType()
  		{
! 			return NHibernate.TimeSpan;
  		}
  
--- 829,833 ----
  		public static NullableType GetTimeSpanType()
  		{
! 			return NHibernateUtil.TimeSpan;
  		}
  
***************
*** 838,842 ****
  		public static NullableType GetTimestampType()
  		{
! 			return NHibernate.Timestamp;
  		}
  
--- 838,842 ----
  		public static NullableType GetTimestampType()
  		{
! 			return NHibernateUtil.Timestamp;
  		}
  
***************
*** 847,851 ****
  		public static NullableType GetTimeType()
  		{
! 			return NHibernate.Time;
  		}
  
--- 847,851 ----
  		public static NullableType GetTimeType()
  		{
! 			return NHibernateUtil.Time;
  		}
  
***************
*** 856,860 ****
  		public static NullableType GetTrueFalseType()
  		{
! 			return NHibernate.TrueFalse;
  		}
  
--- 856,860 ----
  		public static NullableType GetTrueFalseType()
  		{
! 			return NHibernateUtil.TrueFalse;
  		}
  
***************
*** 865,869 ****
  		public static NullableType GetTypeType()
  		{
! 			return NHibernate.Class;
  		}
  
--- 865,869 ----
  		public static NullableType GetTypeType()
  		{
! 			return NHibernateUtil.Class;
  		}
  
***************
*** 894,898 ****
  		public static NullableType GetYesNoType()
  		{
! 			return NHibernate.YesNo;
  		}
  
--- 894,898 ----
  		public static NullableType GetYesNoType()
  		{
! 			return NHibernateUtil.YesNo;
  		}
  

Index: ObjectType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/ObjectType.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ObjectType.cs	31 Dec 2004 23:54:56 -0000	1.9
--- ObjectType.cs	17 Jan 2005 03:40:58 -0000	1.10
***************
*** 53,57 ****
  
  		/// <summary></summary>
! 		internal ObjectType() : this( NHibernate.Class, NHibernate.Serializable )
  		{
  		}
--- 53,57 ----
  
  		/// <summary></summary>
! 		internal ObjectType() : this( NHibernateUtil.Class, NHibernateUtil.Serializable )
  		{
  		}
***************
*** 200,204 ****
  		public override string ToXML( object value, ISessionFactoryImplementor factory )
  		{
! 			return NHibernate.Entity( value.GetType() ).ToXML( value, factory );
  		}
  
--- 200,204 ----
  		public override string ToXML( object value, ISessionFactoryImplementor factory )
  		{
! 			return NHibernateUtil.Entity( value.GetType() ).ToXML( value, factory );
  		}