Allow type element

Author: hazzik

src/NHibernate.Test/CollectionTest/IdBagFixture.hbm.xml

@@ -6,8 +6,10 @@
 		</id>
 		<property name="Name" column="aname" />
     <idbag name="Items" cascade="all-delete-orphan">
-      <collection-id type="Int32" column="item_id">
+      <collection-id>
+        <column name="item_id" />
         <generator class="increment" />
+        <type name="Int64" />
       </collection-id>
       <key column="a_id" />
       <element type="string" />

src/NHibernate.Test/MappingByCode/MappersTests/CollectionIdMapperTests.cs

@@ -17,7 +17,8 @@ public void WhenCreateThenHasDefaultTypeAndGenerator()
 			var hbmId = new HbmCollectionId();
 			new CollectionIdMapper(hbmId);
 			Assert.That(hbmId.generator.@class, Is.Not.Null.And.Not.Empty);
-			Assert.That(hbmId.type, Is.Not.Null.And.Not.Empty);
+			Assert.That(hbmId.type1, Is.Not.Null.And.Not.Empty);
+			Assert.That(hbmId.type, Is.Null);
 		}
 
 		[Test]
@@ -27,19 +28,21 @@ public void WhenSetGeneratorThenChangeType()
 			new CollectionIdMapper(hbmId).Generator(Generators.HighLow);
 
 			Assert.That(hbmId.generator.@class, Is.EqualTo("hilo"));
-			Assert.That(hbmId.type.ToLowerInvariant(), Does.Contain("int"));
+			Assert.That(hbmId.type1.ToLowerInvariant(), Does.Contain("int"));
+			Assert.That(hbmId.type, Is.Null);
 		}
 
 		[Test]
 		public void WhenForceTypeThenNotChangeType()
 		{
 			var hbmId = new HbmCollectionId();
 			var collectionIdMapper = new CollectionIdMapper(hbmId);
-			collectionIdMapper.Type((IIdentifierType) NHibernateUtil.Int64);
+			collectionIdMapper.Type(NHibernateUtil.Int64);
 			collectionIdMapper.Generator(Generators.HighLow);
 
 			Assert.That(hbmId.generator.@class, Is.EqualTo("hilo"));
-			Assert.That(hbmId.type, Is.EqualTo("Int64"));
+			Assert.That(hbmId.type1, Is.EqualTo("Int64"));
+			Assert.That(hbmId.type, Is.Null);
 		}
 
 		[Test]