[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel FooBar.hbm.xml,1.17,1.17.2.1 Glarch.hbm.xml,1.9,1.9.2.1 NHibernate.DomainModel-1.1.csproj,1.24,1.24.2.1

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

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

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

Index: FooBar.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/FooBar.hbm.xml,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -C2 -d -r1.17 -r1.17.2.1
*** FooBar.hbm.xml	1 Sep 2004 00:10:11 -0000	1.17
--- FooBar.hbm.xml	27 Sep 2004 03:41:45 -0000	1.17.2.1
***************
*** 11,20 ****
    		dynamic-update="true"
    		dynamic-insert="true"
    	>
-   		<!-- 
- 			proxy doesn't work yet
- 			proxy="NHibernate.DomainModel.FooProxy, NHibernate.DomainModel"
- 		-->
-   	
    		<jcs-cache usage="nonstrict-read-write"/>
    
--- 11,16 ----
    		dynamic-update="true"
    		dynamic-insert="true"
+   		proxy="NHibernate.DomainModel.FooProxy, NHibernate.DomainModel"
    	>
    		<jcs-cache usage="nonstrict-read-write"/>
    
***************
*** 155,171 ****
      		name="NHibernate.DomainModel.Trivial, NHibernate.DomainModel"
      		discriminator-value="T"
      	/>
!     	<!-- 
! 			proxy doesn't work yet
! 			proxy="NHibernate.DomainModel.FooProxy, NHibernate.DomainModel"
! 		-->
! 		<subclass 
      		name="NHibernate.DomainModel.Abstract, NHibernate.DomainModel" 
      		discriminator-value="null"
      	>
!     		<!-- 
! 			proxy doesn't work yet
! 			proxy="NHibernate.DomainModel.AbstractProxy, NHibernate.DomainModel"
! 		-->
  			<set name="Abstracts">
  				<key column="abstract_id"/>
--- 151,162 ----
      		name="NHibernate.DomainModel.Trivial, NHibernate.DomainModel"
      		discriminator-value="T"
+     		proxy="NHibernate.DomainModel.FooProxy, NHibernate.DomainModel"
      	/>
!     	<subclass 
      		name="NHibernate.DomainModel.Abstract, NHibernate.DomainModel" 
      		discriminator-value="null"
+     		proxy="NHibernate.DomainModel.AbstractProxy, NHibernate.DomainModel"
      	>
!     		
  			<set name="Abstracts">
  				<key column="abstract_id"/>
***************
*** 173,184 ****
  			</set>
  			<property name="Time" column="the_time"/>
  			<subclass 
          		name="NHibernate.DomainModel.Bar, NHibernate.DomainModel" 
          		discriminator-value="B"
          	>
-         		<!-- 
- 					proxy doesn't work yet
- 					proxy="NHibernate.DomainModel.BarProxy, NHibernate.DomainModel"
- 				-->
  				<many-to-one name="Baz"/>
  				<property name="BarString">
--- 164,173 ----
  			</set>
  			<property name="Time" column="the_time"/>
+ 			
  			<subclass 
          		name="NHibernate.DomainModel.Bar, NHibernate.DomainModel" 
          		discriminator-value="B"
+         		proxy="NHibernate.DomainModel.BarProxy, NHibernate.DomainModel"
          	>
  				<many-to-one name="Baz"/>
  				<property name="BarString">

Index: NHibernate.DomainModel-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel-1.1.csproj,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -C2 -d -r1.24 -r1.24.2.1
*** NHibernate.DomainModel-1.1.csproj	1 Sep 2004 00:10:11 -0000	1.24
--- NHibernate.DomainModel-1.1.csproj	27 Sep 2004 03:41:45 -0000	1.24.2.1
***************
*** 613,616 ****
--- 613,630 ----
                  />
                  <File
+                     RelPath = "NHSpecific\AvalonProxy.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "NHSpecific\AvalonProxyImpl.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "NHSpecific\AvalonProxyImpl.hbm.xml"
+                     BuildAction = "EmbeddedResource"
+                 />
+                 <File
                      RelPath = "NHSpecific\BasicBinary.cs"
                      SubType = "Code"

Index: Glarch.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Glarch.hbm.xml,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** Glarch.hbm.xml	31 Aug 2004 21:22:58 -0000	1.9
--- Glarch.hbm.xml	27 Sep 2004 03:41:45 -0000	1.9.2.1
***************
*** 5,14 ****
  		table="`glarchez`"
  		dynamic-update="true"
  	>
- 		<!-- 
- 			proxy doesn't work yet
- 			proxy="NHibernate.DomainModel.GlarchProxy, NHibernate.DomainModel"
- 		-->
- 		
  		<!-- <jcs-cache usage="read-write" /> -->
  		<!-- commented out in h2.0.3 also -->
--- 5,10 ----
  		table="`glarchez`"
  		dynamic-update="true"
+ 		proxy="NHibernate.DomainModel.GlarchProxy, NHibernate.DomainModel"
  	>
  		<!-- <jcs-cache usage="read-write" /> -->
  		<!-- commented out in h2.0.3 also -->