[Nhibernate-commit] nhibernate/src/NHibernate NHibernate-1.1.csproj,1.48,1.48.2.1 NHibernate.build,1.1,1.1.2.1 NHibernate.cs,1.22,1.22.2.1

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

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

Modified Files:
      Tag: alpha_avalon-proxy
	NHibernate-1.1.csproj NHibernate.build NHibernate.cs 
Log Message:
commit on the avalon-proxy branch of a semi-working (no serialization) of 
proxies yet.

Index: NHibernate-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/NHibernate-1.1.csproj,v
retrieving revision 1.48
retrieving revision 1.48.2.1
diff -C2 -d -r1.48 -r1.48.2.1
*** NHibernate-1.1.csproj	22 Sep 2004 22:32:49 -0000	1.48
--- NHibernate-1.1.csproj	27 Sep 2004 03:41:44 -0000	1.48.2.1
***************
*** 100,103 ****
--- 100,108 ----
                      HintPath = "..\..\external-bin\HashCodeProvider.dll"
                  />
+                 <Reference
+                     Name = "Apache.Avalon.DynamicProxy"
+                     AssemblyName = "Apache.Avalon.DynamicProxy"
+                     HintPath = "..\..\external-bin\Apache.Avalon.DynamicProxy.dll"
+                 />
              </References>
          </Build>
***************
*** 1364,1373 ****
                  />
                  <File
!                     RelPath = "Proxy\HibernateProxy.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
!                     RelPath = "Proxy\HibernateProxyHelper.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
--- 1369,1388 ----
                  />
                  <File
!                     RelPath = "Proxy\AvalonLazyInitializer.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
!                     RelPath = "Proxy\AvalonProxyGenerator.cs"
!                     SubType = "Code"
!                     BuildAction = "Compile"
!                 />
!                 <File
!                     RelPath = "Proxy\INHibernateProxy.cs"
!                     SubType = "Code"
!                     BuildAction = "Compile"
!                 />
!                 <File
!                     RelPath = "Proxy\IProxyGenerator.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
***************
*** 1379,1382 ****
--- 1394,1412 ----
                  />
                  <File
+                     RelPath = "Proxy\NHibernateProxyHelper.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "Proxy\ProxyGeneratorFactory.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "Proxy\SerializableProxy.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "SqlCommand\Alias.cs"
                      SubType = "Code"

Index: NHibernate.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/NHibernate.cs,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -C2 -d -r1.22 -r1.22.2.1
*** NHibernate.cs	25 Aug 2004 03:59:07 -0000	1.22
--- NHibernate.cs	27 Sep 2004 03:41:45 -0000	1.22.2.1
***************
*** 249,255 ****
  				return;
  			}
! 			else if ( proxy is HibernateProxy )
  			{
! 				HibernateProxyHelper.GetLazyInitializer( (HibernateProxy) proxy ).Initialize();
  			}
  			else if ( proxy is PersistentCollection )
--- 249,255 ----
  				return;
  			}
! 			else if ( proxy is INHibernateProxy )
  			{
! 				NHibernateProxyHelper.GetLazyInitializer( (INHibernateProxy) proxy ).Initialize();
  			}
  			else if ( proxy is PersistentCollection )
***************
*** 266,272 ****
  		public static bool IsInitialized(object proxy)
  		{
! 			if ( proxy is HibernateProxy ) 
  			{
! 				return !HibernateProxyHelper.GetLazyInitializer( (HibernateProxy) proxy ).IsUninitialized;
  			} 
  			else if ( proxy is PersistentCollection ) 
--- 266,272 ----
  		public static bool IsInitialized(object proxy)
  		{
! 			if ( proxy is INHibernateProxy ) 
  			{
! 				return !NHibernateProxyHelper.GetLazyInitializer( (INHibernateProxy) proxy ).IsUninitialized;
  			} 
  			else if ( proxy is PersistentCollection ) 
***************
*** 288,294 ****
  		public System.Type GetClass(object proxy) 
  		{
! 			if(proxy is HibernateProxy) 
  			{
! 				return HibernateProxyHelper.GetLazyInitializer( (HibernateProxy) proxy ).GetImplementation().GetType();
  			}
  			else 
--- 288,294 ----
  		public System.Type GetClass(object proxy) 
  		{
! 			if(proxy is INHibernateProxy) 
  			{
! 				return NHibernateProxyHelper.GetLazyInitializer( (INHibernateProxy) proxy ).GetImplementation().GetType();
  			}
  			else 

Index: NHibernate.build
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/NHibernate.build,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** NHibernate.build	13 Sep 2004 23:15:29 -0000	1.1
--- NHibernate.build	27 Sep 2004 03:41:45 -0000	1.1.2.1
***************
*** 74,77 ****
--- 74,78 ----
  				<includes name="System.XML.dll" />
  				<includes name="System.Data.dll" />
+ 				<includes name="Apache.Avalon.DynamicProxy.dll" />
  				<includes name="log4net.dll" />
  				<includes name="HashCodeProvider.dll" />