[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel/NHSpecific ClassWithCompositeId.cs,1.1,1.2 ClassWithCompositeId.hbm.xml,1.2,1.3 CompositeId.cs,1.1,1.2

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

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

Modified Files:
	ClassWithCompositeId.cs ClassWithCompositeId.hbm.xml 
	CompositeId.cs 
Log Message:
modified to verify that access attribute does work correctly with
composite-id

Index: CompositeId.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/NHSpecific/CompositeId.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompositeId.cs	9 Jun 2004 01:04:35 -0000	1.1
--- CompositeId.cs	26 Oct 2004 18:21:18 -0000	1.2
***************
*** 27,38 ****
  		}
  
! 		public short KeyShort {
! 			get { return _keyShort;}
! 			set {_keyShort = value;}
! 		}
  
  		public System.DateTime KeyDateTime {
  			get { return _keyDateTime;}
! 			set {_keyDateTime = value;}
  		}
  
--- 27,38 ----
  		}
  
! //		public short KeyShort {
! //			get { return _keyShort;}
! //			set {_keyShort = value;}
! //		}
  
  		public System.DateTime KeyDateTime {
  			get { return _keyDateTime;}
! //			set {_keyDateTime = value;}
  		}
  

Index: ClassWithCompositeId.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/NHSpecific/ClassWithCompositeId.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ClassWithCompositeId.cs	9 Jun 2004 01:04:35 -0000	1.1
--- ClassWithCompositeId.cs	26 Oct 2004 18:21:18 -0000	1.2
***************
*** 12,19 ****
  
  		public ClassWithCompositeId(){}
  
  		public CompositeId Id {
  			get {return _id;}
! 			set {_id = value;}
  		}
  
--- 12,24 ----
  
  		public ClassWithCompositeId(){}
+ 	
+ 		public ClassWithCompositeId(CompositeId id ) 
+ 		{
+ 			_id = id;
+ 		}
  
  		public CompositeId Id {
  			get {return _id;}
! 			//set {_id = value;}
  		}
  

Index: ClassWithCompositeId.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/NHSpecific/ClassWithCompositeId.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ClassWithCompositeId.hbm.xml	19 Jul 2004 03:19:01 -0000	1.2
--- ClassWithCompositeId.hbm.xml	26 Oct 2004 18:21:18 -0000	1.3
***************
*** 7,14 ****
  		table="class_w_com_id"
  	>
! 		<composite-id name="Id" class="NHibernate.DomainModel.NHSpecific.CompositeId, NHibernate.DomainModel">
! 			<key-property name="KeyString" column="string_" type="String(20)" length="20"/>
! 			<key-property name="KeyShort" column="short_"/>
! 			<key-property name="KeyDateTime" column="date_" type="DateTime"/>
  		</composite-id>
  		
--- 7,14 ----
  		table="class_w_com_id"
  	>
! 		<composite-id name="Id" class="NHibernate.DomainModel.NHSpecific.CompositeId, NHibernate.DomainModel" access="nosetter.camelcase-underscore">
! 			<key-property name="KeyString" column="string_" type="String(20)" length="20" />
! 			<key-property name="KeyShort" column="short_" access="field.camelcase-underscore"/>
! 			<key-property name="KeyDateTime" column="date_" type="DateTime" access="nosetter.camelcase-underscore"/>
  		</composite-id>