[234530]

[235028]

9 files changed, 87 insertions, 243 deletions

diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_a_o_hibernate.hbm.xml
index 46681eb6d..02055308f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_a_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_a_o_hibernate.hbm.xml
@@ -2,46 +2,6 @@
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping auto-import="false">
-	<typedef name="simpletypes.Bool" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">Bool</param>
-	</typedef>
-	<typedef name="simpletypes.Byte" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">Byte</param>
-	</typedef>
-	<typedef name="simpletypes.ByteArray" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">ByteArray</param>
-	</typedef>
-	<typedef name="simpletypes.Double" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">Double</param>
-	</typedef>
-	<typedef name="simpletypes.DoubleArray" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">DoubleArray</param>
-	</typedef>
-	<typedef name="simpletypes.Float" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">Float</param>
-	</typedef>
-	<typedef name="simpletypes.Int" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">Int</param>
-	</typedef>
-	<typedef name="simpletypes.IntArray" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">IntArray</param>
-	</typedef>
-	<typedef name="simpletypes.LimitedDecimal" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">LimitedDecimal</param>
-	</typedef>
-	<typedef name="simpletypes.Long" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">Long</param>
-	</typedef>
 	<typedef name="simpletypes.SimpleEnumObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
 		<param name="edatatype">SimpleEnumObject</param>
@@ -76,35 +36,35 @@
 				<column name="`simplelist_byt_e_id`" not-null="true" unique="false"/>
 			</key>
 			<list-index column="`simplelist_byt_idx`"/>
-			<element type="simpletypes.Byte"/>
+			<element type="java.lang.Byte"/>
 		</list>
 		<list name="doubl" table="`simplelist_doubl`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`simplelist_doubl_e_id`" not-null="true" unique="false"/>
 			</key>
 			<list-index column="`simplelist_doubl_idx`"/>
-			<element type="simpletypes.Double"/>
+			<element type="java.lang.Double"/>
 		</list>
 		<list name="floa" table="`simplelist_floa`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`simplelist_floa_e_id`" not-null="true" unique="false"/>
 			</key>
 			<list-index column="`simplelist_floa_idx`"/>
-			<element type="simpletypes.Float"/>
+			<element type="java.lang.Float"/>
 		</list>
 		<list name="inte" table="`simplelist_inte`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`simplelist_inte_e_id`" not-null="true" unique="false"/>
 			</key>
 			<list-index column="`simplelist_inte_idx`"/>
-			<element type="simpletypes.Int"/>
+			<element type="java.lang.Integer"/>
 		</list>
 		<list name="long" table="`longnum`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`simplelist_long_e_id`" not-null="true" unique="false"/>
 			</key>
 			<list-index column="`simplelist_long_idx`"/>
-			<element type="simpletypes.Long"/>
+			<element type="java.lang.Long"/>
 		</list>
 		<list name="shor" table="`simplelist_shor`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
@@ -145,18 +105,30 @@
 			<list-index column="`simplelist_stri_idx`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<property name="intArray" lazy="false" insert="true" update="true" not-null="true" unique="false" type="simpletypes.IntArray">
-			<column not-null="true" unique="false" name="`intarray`"/>
-		</property>
-		<property name="doubleArray" lazy="false" insert="true" update="true" not-null="true" unique="false" type="simpletypes.DoubleArray">
-			<column not-null="true" unique="false" name="`doublearray`"/>
-		</property>
+		<array name="intArray" table="`simplelist_intarray`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_intarray_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_intarray_idx`"/>
+			<element type="int"/>
+		</array>
+		<array name="doubleArray" table="`simplelist_doublearray`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_doublearray_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_doublearray_idx`"/>
+			<element type="double"/>
+		</array>
 		<property name="stringArray" lazy="false" insert="true" update="true" not-null="true" unique="false" type="simpletypes.StringArray">
 			<column not-null="true" unique="false" name="`stringarray`"/>
 		</property>
-		<property name="byteArray" lazy="false" insert="true" update="true" not-null="true" unique="false" type="simpletypes.ByteArray">
-			<column not-null="true" unique="false" name="`bytearray`"/>
-		</property>
+		<array name="byteArray" table="`simplelist_bytearray`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_bytearray_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_bytearray_idx`"/>
+			<element type="byte"/>
+		</array>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleTypeImpl" entity-name="SimpleType" abstract="false" lazy="false" discriminator-value="SimpleType" table="`simpletype`">
 		<meta attribute="eclassName">SimpleType</meta>
@@ -205,7 +177,7 @@
 		<property name="limitedstring" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`limitedstring`" length="10"/>
 		</property>
-		<property name="limitedDecimal" lazy="false" insert="true" update="true" not-null="true" unique="false" type="simpletypes.LimitedDecimal">
+		<property name="limitedDecimal" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
 			<column not-null="true" unique="false" name="`limiteddecimal`" precision="4" scale="1"/>
 		</property>
 		<property name="extraLimitedString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_e_o_hibernate.hbm.xml
index 6540d0fc0..c25476e6a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_e_o_hibernate.hbm.xml
@@ -2,46 +2,6 @@
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping auto-import="false">
-	<typedef name="simpletypes.Bool" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">Bool</param>
-	</typedef>
-	<typedef name="simpletypes.Byte" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">Byte</param>
-	</typedef>
-	<typedef name="simpletypes.ByteArray" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">ByteArray</param>
-	</typedef>
-	<typedef name="simpletypes.Double" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">Double</param>
-	</typedef>
-	<typedef name="simpletypes.DoubleArray" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">DoubleArray</param>
-	</typedef>
-	<typedef name="simpletypes.Float" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">Float</param>
-	</typedef>
-	<typedef name="simpletypes.Int" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">Int</param>
-	</typedef>
-	<typedef name="simpletypes.IntArray" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">IntArray</param>
-	</typedef>
-	<typedef name="simpletypes.LimitedDecimal" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">LimitedDecimal</param>
-	</typedef>
-	<typedef name="simpletypes.Long" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">Long</param>
-	</typedef>
 	<typedef name="simpletypes.SimpleEnumObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
 		<param name="edatatype">SimpleEnumObject</param>
@@ -75,35 +35,35 @@
 				<column name="`simplelist_byt_e_id`" not-null="true" unique="false"/>
 			</key>
 			<list-index column="`simplelist_byt_idx`"/>
-			<element type="simpletypes.Byte"/>
+			<element type="java.lang.Byte"/>
 		</list>
 		<list name="doubl" table="`simplelist_doubl`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`simplelist_doubl_e_id`" not-null="true" unique="false"/>
 			</key>
 			<list-index column="`simplelist_doubl_idx`"/>
-			<element type="simpletypes.Double"/>
+			<element type="java.lang.Double"/>
 		</list>
 		<list name="floa" table="`simplelist_floa`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`simplelist_floa_e_id`" not-null="true" unique="false"/>
 			</key>
 			<list-index column="`simplelist_floa_idx`"/>
-			<element type="simpletypes.Float"/>
+			<element type="java.lang.Float"/>
 		</list>
 		<list name="inte" table="`simplelist_inte`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`simplelist_inte_e_id`" not-null="true" unique="false"/>
 			</key>
 			<list-index column="`simplelist_inte_idx`"/>
-			<element type="simpletypes.Int"/>
+			<element type="java.lang.Integer"/>
 		</list>
 		<list name="long" table="`longnum`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`simplelist_long_e_id`" not-null="true" unique="false"/>
 			</key>
 			<list-index column="`simplelist_long_idx`"/>
-			<element type="simpletypes.Long"/>
+			<element type="java.lang.Long"/>
 		</list>
 		<list name="shor" table="`simplelist_shor`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
@@ -144,18 +104,30 @@
 			<list-index column="`simplelist_stri_idx`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<property name="intArray" lazy="false" insert="true" update="true" not-null="true" unique="false" type="simpletypes.IntArray">
-			<column not-null="true" unique="false" name="`intarray`"/>
-		</property>
-		<property name="doubleArray" lazy="false" insert="true" update="true" not-null="true" unique="false" type="simpletypes.DoubleArray">
-			<column not-null="true" unique="false" name="`doublearray`"/>
-		</property>
+		<array name="intArray" table="`simplelist_intarray`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_intarray_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_intarray_idx`"/>
+			<element type="int"/>
+		</array>
+		<array name="doubleArray" table="`simplelist_doublearray`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_doublearray_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_doublearray_idx`"/>
+			<element type="double"/>
+		</array>
 		<property name="stringArray" lazy="false" insert="true" update="true" not-null="true" unique="false" type="simpletypes.StringArray">
 			<column not-null="true" unique="false" name="`stringarray`"/>
 		</property>
-		<property name="byteArray" lazy="false" insert="true" update="true" not-null="true" unique="false" type="simpletypes.ByteArray">
-			<column not-null="true" unique="false" name="`bytearray`"/>
-		</property>
+		<array name="byteArray" table="`simplelist_bytearray`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_bytearray_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_bytearray_idx`"/>
+			<element type="byte"/>
+		</array>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleTypeImpl" entity-name="SimpleType" abstract="false" lazy="false" table="`simpletype`">
 		<meta attribute="eclassName">SimpleType</meta>
@@ -203,7 +175,7 @@
 		<property name="limitedstring" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`limitedstring`" length="10"/>
 		</property>
-		<property name="limitedDecimal" lazy="false" insert="true" update="true" not-null="true" unique="false" type="simpletypes.LimitedDecimal">
+		<property name="limitedDecimal" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
 			<column not-null="true" unique="false" name="`limiteddecimal`" precision="4" scale="1"/>
 		</property>
 		<property name="extraLimitedString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_s_o_hibernate.hbm.xml
index 6540d0fc0..c25476e6a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_s_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SimpleTypeAction_mysql_s_o_hibernate.hbm.xml
@@ -2,46 +2,6 @@
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping auto-import="false">
-	<typedef name="simpletypes.Bool" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">Bool</param>
-	</typedef>
-	<typedef name="simpletypes.Byte" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">Byte</param>
-	</typedef>
-	<typedef name="simpletypes.ByteArray" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">ByteArray</param>
-	</typedef>
-	<typedef name="simpletypes.Double" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">Double</param>
-	</typedef>
-	<typedef name="simpletypes.DoubleArray" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">DoubleArray</param>
-	</typedef>
-	<typedef name="simpletypes.Float" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">Float</param>
-	</typedef>
-	<typedef name="simpletypes.Int" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">Int</param>
-	</typedef>
-	<typedef name="simpletypes.IntArray" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">IntArray</param>
-	</typedef>
-	<typedef name="simpletypes.LimitedDecimal" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">LimitedDecimal</param>
-	</typedef>
-	<typedef name="simpletypes.Long" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
-		<param name="edatatype">Long</param>
-	</typedef>
 	<typedef name="simpletypes.SimpleEnumObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param>
 		<param name="edatatype">SimpleEnumObject</param>
@@ -75,35 +35,35 @@
 				<column name="`simplelist_byt_e_id`" not-null="true" unique="false"/>
 			</key>
 			<list-index column="`simplelist_byt_idx`"/>
-			<element type="simpletypes.Byte"/>
+			<element type="java.lang.Byte"/>
 		</list>
 		<list name="doubl" table="`simplelist_doubl`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`simplelist_doubl_e_id`" not-null="true" unique="false"/>
 			</key>
 			<list-index column="`simplelist_doubl_idx`"/>
-			<element type="simpletypes.Double"/>
+			<element type="java.lang.Double"/>
 		</list>
 		<list name="floa" table="`simplelist_floa`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`simplelist_floa_e_id`" not-null="true" unique="false"/>
 			</key>
 			<list-index column="`simplelist_floa_idx`"/>
-			<element type="simpletypes.Float"/>
+			<element type="java.lang.Float"/>
 		</list>
 		<list name="inte" table="`simplelist_inte`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`simplelist_inte_e_id`" not-null="true" unique="false"/>
 			</key>
 			<list-index column="`simplelist_inte_idx`"/>
-			<element type="simpletypes.Int"/>
+			<element type="java.lang.Integer"/>
 		</list>
 		<list name="long" table="`longnum`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`simplelist_long_e_id`" not-null="true" unique="false"/>
 			</key>
 			<list-index column="`simplelist_long_idx`"/>
-			<element type="simpletypes.Long"/>
+			<element type="java.lang.Long"/>
 		</list>
 		<list name="shor" table="`simplelist_shor`" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
@@ -144,18 +104,30 @@
 			<list-index column="`simplelist_stri_idx`"/>
 			<element type="java.lang.String"/>
 		</list>
-		<property name="intArray" lazy="false" insert="true" update="true" not-null="true" unique="false" type="simpletypes.IntArray">
-			<column not-null="true" unique="false" name="`intarray`"/>
-		</property>
-		<property name="doubleArray" lazy="false" insert="true" update="true" not-null="true" unique="false" type="simpletypes.DoubleArray">
-			<column not-null="true" unique="false" name="`doublearray`"/>
-		</property>
+		<array name="intArray" table="`simplelist_intarray`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_intarray_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_intarray_idx`"/>
+			<element type="int"/>
+		</array>
+		<array name="doubleArray" table="`simplelist_doublearray`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_doublearray_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_doublearray_idx`"/>
+			<element type="double"/>
+		</array>
 		<property name="stringArray" lazy="false" insert="true" update="true" not-null="true" unique="false" type="simpletypes.StringArray">
 			<column not-null="true" unique="false" name="`stringarray`"/>
 		</property>
-		<property name="byteArray" lazy="false" insert="true" update="true" not-null="true" unique="false" type="simpletypes.ByteArray">
-			<column not-null="true" unique="false" name="`bytearray`"/>
-		</property>
+		<array name="byteArray" table="`simplelist_bytearray`" cascade="all,delete-orphan">
+			<key update="true">
+				<column name="`simplelist_bytearray_e_id`" not-null="true" unique="false"/>
+			</key>
+			<list-index column="`simplelist_bytearray_idx`"/>
+			<element type="byte"/>
+		</array>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.impl.SimpleTypeImpl" entity-name="SimpleType" abstract="false" lazy="false" table="`simpletype`">
 		<meta attribute="eclassName">SimpleType</meta>
@@ -203,7 +175,7 @@
 		<property name="limitedstring" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`limitedstring`" length="10"/>
 		</property>
-		<property name="limitedDecimal" lazy="false" insert="true" update="true" not-null="true" unique="false" type="simpletypes.LimitedDecimal">
+		<property name="limitedDecimal" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.math.BigDecimal">
 			<column not-null="true" unique="false" name="`limiteddecimal`" precision="4" scale="1"/>
 		</property>
 		<property name="extraLimitedString" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_a_o_hibernate.hbm.xml
index 9d39535cb..55eb386b8 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_a_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_a_o_hibernate.hbm.xml
@@ -2,18 +2,6 @@
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping auto-import="false">
-	<typedef name="substitution.EvenType" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</param>
-		<param name="edatatype">EvenType</param>
-	</typedef>
-	<typedef name="substitution.OddType" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</param>
-		<param name="edatatype">OddType</param>
-	</typedef>
-	<typedef name="substitution.SimpleNumber" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</param>
-		<param name="edatatype">SimpleNumber</param>
-	</typedef>
 	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.ComplexNumberImpl" entity-name="ComplexNumber" abstract="false" lazy="false" discriminator-value="ComplexNumber" table="`complexnumber`">
 		<meta attribute="eclassName">ComplexNumber</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
@@ -109,7 +97,7 @@
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="mySimpleAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="substitution.SimpleNumber">
+		<property name="mySimpleAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
 			<column not-null="false" unique="false" name="`mysimpleabstractgroup_mysimpleabstract`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_e_o_hibernate.hbm.xml
index dbe33fdd8..64bda24b3 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_e_o_hibernate.hbm.xml
@@ -2,18 +2,6 @@
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping auto-import="false">
-	<typedef name="substitution.EvenType" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</param>
-		<param name="edatatype">EvenType</param>
-	</typedef>
-	<typedef name="substitution.OddType" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</param>
-		<param name="edatatype">OddType</param>
-	</typedef>
-	<typedef name="substitution.SimpleNumber" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</param>
-		<param name="edatatype">SimpleNumber</param>
-	</typedef>
 	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.ComplexNumberImpl" entity-name="ComplexNumber" abstract="false" lazy="false" table="`complexnumber`">
 		<meta attribute="eclassName">ComplexNumber</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
@@ -109,7 +97,7 @@
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="mySimpleAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="substitution.SimpleNumber">
+		<property name="mySimpleAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
 			<column not-null="false" unique="false" name="`mysimpleabstractgroup_mysimpleabstract`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_s_o_hibernate.hbm.xml
index dbe33fdd8..64bda24b3 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_s_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionAction_mysql_s_o_hibernate.hbm.xml
@@ -2,18 +2,6 @@
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping auto-import="false">
-	<typedef name="substitution.EvenType" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</param>
-		<param name="edatatype">EvenType</param>
-	</typedef>
-	<typedef name="substitution.OddType" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</param>
-		<param name="edatatype">OddType</param>
-	</typedef>
-	<typedef name="substitution.SimpleNumber" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</param>
-		<param name="edatatype">SimpleNumber</param>
-	</typedef>
 	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitution.impl.ComplexNumberImpl" entity-name="ComplexNumber" abstract="false" lazy="false" table="`complexnumber`">
 		<meta attribute="eclassName">ComplexNumber</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitution</meta>
@@ -109,7 +97,7 @@
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="mySimpleAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="substitution.SimpleNumber">
+		<property name="mySimpleAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
 			<column not-null="false" unique="false" name="`mysimpleabstractgroup_mysimpleabstract`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_a_o_hibernate.hbm.xml
index c6eec722b..76f6f72a4 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_a_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_a_o_hibernate.hbm.xml
@@ -2,18 +2,6 @@
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping auto-import="false">
-	<typedef name="substitutionzvon.AAA" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</param>
-		<param name="edatatype">AAA</param>
-	</typedef>
-	<typedef name="substitutionzvon.EvenType" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</param>
-		<param name="edatatype">EvenType</param>
-	</typedef>
-	<typedef name="substitutionzvon.OddType" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</param>
-		<param name="edatatype">OddType</param>
-	</typedef>
 	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexAAAImpl" entity-name="ComplexAAA" abstract="false" lazy="false" discriminator-value="ComplexAAA" table="`complexaaa`">
 		<meta attribute="eclassName">ComplexAAA</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</meta>
@@ -72,7 +60,7 @@
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="myAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="substitutionzvon.AAA">
+		<property name="myAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
 			<column not-null="false" unique="false" name="`myabstractgroup_myabstract`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_e_o_hibernate.hbm.xml
index c58ed9bb4..6ee287893 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_e_o_hibernate.hbm.xml
@@ -2,18 +2,6 @@
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping auto-import="false">
-	<typedef name="substitutionzvon.AAA" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</param>
-		<param name="edatatype">AAA</param>
-	</typedef>
-	<typedef name="substitutionzvon.EvenType" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</param>
-		<param name="edatatype">EvenType</param>
-	</typedef>
-	<typedef name="substitutionzvon.OddType" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</param>
-		<param name="edatatype">OddType</param>
-	</typedef>
 	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexAAAImpl" entity-name="ComplexAAA" abstract="false" lazy="false" table="`complexaaa`">
 		<meta attribute="eclassName">ComplexAAA</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</meta>
@@ -76,7 +64,7 @@
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="myAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="substitutionzvon.AAA">
+		<property name="myAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
 			<column not-null="false" unique="false" name="`myabstractgroup_myabstract`"/>
 		</property>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_s_o_hibernate.hbm.xml
index c58ed9bb4..6ee287893 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_s_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.schemaconstructs/SubstitutionzvonAction_mysql_s_o_hibernate.hbm.xml
@@ -2,18 +2,6 @@
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping auto-import="false">
-	<typedef name="substitutionzvon.AAA" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</param>
-		<param name="edatatype">AAA</param>
-	</typedef>
-	<typedef name="substitutionzvon.EvenType" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</param>
-		<param name="edatatype">EvenType</param>
-	</typedef>
-	<typedef name="substitutionzvon.OddType" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType">
-		<param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</param>
-		<param name="edatatype">OddType</param>
-	</typedef>
 	<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.substitutionzvon.impl.ComplexAAAImpl" entity-name="ComplexAAA" abstract="false" lazy="false" table="`complexaaa`">
 		<meta attribute="eclassName">ComplexAAA</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/substitutionzvon</meta>
@@ -76,7 +64,7 @@
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="myAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="substitutionzvon.AAA">
+		<property name="myAbstract" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
 			<column not-null="false" unique="false" name="`myabstractgroup_myabstract`"/>
 		</property>
 	</class>