[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel Baz.cs,1.7,1.8 Baz.hbm.xml,1.10,1.11 CompositeElement.cs,1.1,1.2 Middle.hbm.xml,1.1,1.2

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

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

Modified Files:
	Baz.cs Baz.hbm.xml CompositeElement.cs Middle.hbm.xml 
Log Message:
Fixed naming of properties to follow .net standard

Index: Middle.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Middle.hbm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Middle.hbm.xml	3 Jun 2004 18:01:24 -0000	1.1
--- Middle.hbm.xml	8 Jun 2004 11:46:06 -0000	1.2
***************
*** 8,12 ****
          <composite-id name="Id">
              <key-property 
! 				name="akey" 
  				type="String(10)" 
  				length="10" 
--- 8,12 ----
          <composite-id name="Id">
              <key-property 
! 				name="AKey" 
  				type="String(10)" 
  				length="10" 
***************
*** 14,18 ****
  			/>
              <key-property 
! 				name="bkey" 
  				type="String(10)" 
  				length="10" 
--- 14,18 ----
  			/>
              <key-property 
! 				name="BKey" 
  				type="String(10)" 
  				length="10" 
***************
*** 36,40 ****
  	>
          <composite-id name="Id">
!             <key-many-to-one name="sup">
                  <column 
  					length="10" 
--- 36,40 ----
  	>
          <composite-id name="Id">
!             <key-many-to-one name="Sup">
                  <column 
  					length="10" 
***************
*** 73,77 ****
  	>
          <composite-id name="Id">
!             <key-many-to-one name="master">
                  <column name="AKEY"/>
                  <column name="BKEY"/>
--- 73,77 ----
  	>
          <composite-id name="Id">
!             <key-many-to-one name="Master">
                  <column name="AKEY"/>
                  <column name="BKEY"/>
***************
*** 80,84 ****
              </key-many-to-one>
              <key-property 
! 				name="detailId" 
  				type="String(10)" 
  				column="ID" 
--- 80,84 ----
              </key-many-to-one>
              <key-property 
! 				name="DetailId" 
  				type="String(10)" 
  				column="ID" 

Index: Baz.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Baz.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Baz.cs	4 Jun 2004 12:02:44 -0000	1.7
--- Baz.cs	8 Jun 2004 11:46:06 -0000	1.8
***************
*** 611,619 ****
  
  		 CompositeElement ce = new CompositeElement();
! 		 ce.foo = "foo";
! 		 ce.bar = "bar";
  		 CompositeElement ce2 = new CompositeElement();
! 		 ce2.foo = "fooxxx";
! 		 ce2.bar = "barxxx";
  		 Cached.Add(ce, new object());
  		 Cached.Add(ce2, new object());
--- 611,619 ----
  
  		 CompositeElement ce = new CompositeElement();
! 		 ce.Foo = "foo";
! 		 ce.Bar = "bar";
  		 CompositeElement ce2 = new CompositeElement();
! 		 ce2.Foo = "fooxxx";
! 		 ce2.Bar = "barxxx";
  		 Cached.Add(ce, new object());
  		 Cached.Add(ce2, new object());

Index: Baz.hbm.xml
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Baz.hbm.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Baz.hbm.xml	4 Jun 2004 12:02:44 -0000	1.10
--- Baz.hbm.xml	8 Jun 2004 11:46:06 -0000	1.11
***************
*** 285,290 ****
  			<key column="baz"/>
  			<composite-element class="NHibernate.DomainModel.CompositeElement, NHibernate.DomainModel">
! 				<property name="foo"/>
! 				<property name="bar"/>
  			</composite-element>
  		</set>
--- 285,290 ----
  			<key column="baz"/>
  			<composite-element class="NHibernate.DomainModel.CompositeElement, NHibernate.DomainModel">
! 				<property name="Foo"/>
! 				<property name="Bar"/>
  			</composite-element>
  		</set>
***************
*** 295,300 ****
  			<index-many-to-many column="another_baz" class="NHibernate.DomainModel.Baz, NHibernate.DomainModel"/>
  			<composite-element class="NHibernate.DomainModel.CompositeElement, NHibernate.DomainModel">
! 				<property name="foo"/>
! 				<property name="bar"/>
  			</composite-element>
  		</map>
--- 295,300 ----
  			<index-many-to-many column="another_baz" class="NHibernate.DomainModel.Baz, NHibernate.DomainModel"/>
  			<composite-element class="NHibernate.DomainModel.CompositeElement, NHibernate.DomainModel">
! 				<property name="Foo"/>
! 				<property name="Bar"/>
  			</composite-element>
  		</map>

Index: CompositeElement.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/CompositeElement.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompositeElement.cs	8 Apr 2004 14:59:32 -0000	1.1
--- CompositeElement.cs	8 Jun 2004 11:46:06 -0000	1.2
***************
*** 1,12 ****
- //------------------------------------------------------------------------------
- // <autogenerated>
- //     This code was generated by a tool.
- //     Runtime Version: v1.1.4322
- //
- //     Changes to this file may cause incorrect behavior and will be lost if 
- //     the code is regenerated.
- // </autogenerated>
- //------------------------------------------------------------------------------
- 
  using System;
  
--- 1,2 ----
***************
*** 14,23 ****
  {
  
-  /// <summary>
-  /// POJO for CompositeElement
-  /// </summary>
-  /// <remark>
-  /// This class is autogenerated
-  /// </remark>
   [Serializable]
   public class CompositeElement : IComparable
--- 4,7 ----
***************
*** 25,36 ****
  
  	#region Fields
- 	/// <summary>
- 	/// Holder for foo
- 	/// </summary>
  	private String _foo;
- 	
- 	/// <summary>
- 	/// Holder for bar
- 	/// </summary>
  	private String _bar;
  	
--- 9,13 ----
***************
*** 62,75 ****
  	/// Get/set for foo
  	/// </summary>
! 	public String foo
  	{
! 		get
! 		{
! 			return this._foo;
! 		}
! 		set
! 		{
! 			this._foo = value;
! 		}
  	}
  	
--- 39,46 ----
  	/// Get/set for foo
  	/// </summary>
! 	public String Foo
  	{
! 		get { return _foo; }
! 		set { _foo = value; }
  	}
  	
***************
*** 77,90 ****
  	/// Get/set for bar
  	/// </summary>
! 	public String bar
  	{
! 		get
! 		{
! 			return this._bar;
! 		}
! 		set
! 		{
! 			this._bar = value;
! 		}
  	}
  	
--- 48,55 ----
  	/// Get/set for bar
  	/// </summary>
! 	public String Bar
  	{
! 		get { return _bar; }
! 		set { _bar = value; }
  	}
  	
***************
*** 96,100 ****
  	 public int CompareTo(object obj)
  	 {
! 			 return ( (CompositeElement) obj ).foo.CompareTo(foo);
	 }
  
  	 #endregion
--- 61,65 ----
  	 public int CompareTo(object obj)
  	 {
! 			 return ( (CompositeElement) obj ).Foo.CompareTo(Foo);
	 }
  
  	 #endregion