[181631]

47 files changed, 93 insertions, 65 deletions

diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_a_o_package.jdo
index 23a8097a5..1c1eb0f79 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_a_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:47 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:56 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.basic.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.basic.impl.BasicImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="basic" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_s_o_package.jdo
index 33b41174b..32bc337b7 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_s_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:14 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:36 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.basic.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.basic.impl.BasicImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="basic" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_a_o_package.jdo
index ae4806e9e..d3e974906 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_a_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:48 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:57 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.column.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.column.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="mybooktable" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_s_o_package.jdo
index d93baea43..68f6ebb1c 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_s_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:15 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:37 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.column.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.column.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="mybooktable" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_a_o_package.jdo
index ab7981df2..8df3398cb 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_a_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:40 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:50 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_ax_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_ax_o_package.jdo
index 48794ee50..b90a7f160 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_ax_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_ax_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 15:59:50 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:23 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_s_o_package.jdo
index 85401e5da..c64e07ead 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_s_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:05 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:31 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_sx_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_sx_o_package.jdo
index c9dae60c1..778b32b09 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_sx_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_sx_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 15:59:45 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:18 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_a_o_package.jdo
index 17c95fd3f..cb4cb7e0d 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_a_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:41 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:51 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.ParentImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" identity-type="application">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_s_o_package.jdo
index d48f1e8bf..83af11c15 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_s_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:06 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:32 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.ParentImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="parent" identity-type="application">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_a_o_package.jdo
index b263afc7a..332e17385 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_a_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:51 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:59 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl.ChildItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="childitem" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_s_o_package.jdo
index 36992274a..9bed852c8 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_s_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:23 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:39 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.duplicates.impl.ChildItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="childitem" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_a_o_package.jdo
index 69a8a2f2a..c41a2be4e 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_a_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:33 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:47 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="mybooktable" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_ax_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_ax_o_package.jdo
index 2bf5f090b..9aec5a364 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_ax_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_ax_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 15:59:48 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:21 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="mybooktable" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_s_o_package.jdo
index be8982107..9f2e182fe 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_s_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 15:59:57 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:29 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="mybooktable" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_sx_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_sx_o_package.jdo
index c6e444690..015c23860 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_sx_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_sx_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 15:59:39 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:14 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.edatatypeColumn.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="mybooktable" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_a_o_package.jdo
index 259a727a3..bc01fe9cc 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_a_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:50 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:43 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.IdentityIDImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="identityid" identity-type="application">
@@ -46,5 +46,16 @@
 			<version strategy="version-number" column="e_version"/>
 			<field name="myid" persistence-modifier="persistent" primary-key="true" value-strategy="increment" indexed="true" strategy="increment" sequence-table-name="TGEN" sequence-nextval-column-name="VAL_COL"/>
 		</class>
+		<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.AutoIDImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="autoid" identity-type="application">
+			<implements name="org.eclipse.emf.teneo.samples.emf.annotations.id.AutoID"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<inheritance strategy="new-table">
+				<discriminator column="dtype" strategy="value-map" value="AutoID"/>
+			</inheritance>
+			<version strategy="version-number" column="e_version"/>
+			<field name="autoID" persistence-modifier="persistent" primary-key="true" value-strategy="auto" indexed="true"/>
+			<field name="name" persistence-modifier="persistent" null-value="none"/>
+		</class>
 	</package>
 </jdo>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_s_o_package.jdo
index 32deea3e2..e3cf1f3b5 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_s_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:22 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:25 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.IdentityIDImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="identityid" identity-type="application">
@@ -38,5 +38,14 @@
 			<version strategy="version-number" column="e_version"/>
 			<field name="myid" persistence-modifier="persistent" primary-key="true" value-strategy="increment" indexed="true" strategy="increment" sequence-table-name="TGEN" sequence-nextval-column-name="VAL_COL"/>
 		</class>
+		<class name="org.eclipse.emf.teneo.samples.emf.annotations.id.impl.AutoIDImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="autoid" identity-type="application">
+			<implements name="org.eclipse.emf.teneo.samples.emf.annotations.id.AutoID"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<inheritance strategy="new-table"/>
+			<version strategy="version-number" column="e_version"/>
+			<field name="autoID" persistence-modifier="persistent" primary-key="true" value-strategy="auto" indexed="true"/>
+			<field name="name" persistence-modifier="persistent" null-value="none"/>
+		</class>
 	</package>
 </jdo>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_a_o_package.jdo
index 5dc89c20e..a199bf135 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_a_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:49 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:58 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="address" identity-type="application">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_ax_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_ax_o_package.jdo
index 485588f7e..fcdffcd4f 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_ax_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_ax_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 15:59:52 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:24 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="address" identity-type="application">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_s_o_package.jdo
index 87331a0d9..25ffb23db 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_s_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:18 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:38 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="address" identity-type="application">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_sx_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_sx_o_package.jdo
index 7c7dbc101..fdcb5696b 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_sx_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_sx_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 15:59:47 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:20 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.impl.AddressImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="address" identity-type="application">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_a_o_package.jdo
index 19da960fd..b3fbfd538 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_a_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:43 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:53 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_s_o_package.jdo
index a45c68aea..39f717a01 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_s_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:10 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:34 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.lazy.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_a_o_package.jdo
index 41371bf3c..fa7edcc80 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_a_o_package.jdo
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:38 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:49 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl">
-		<class name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="person" identity-type="application">
+		<class name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="person" identity-type="datastore">
 			<implements name="org.eclipse.emf.teneo.samples.emf.annotations.lob.Person"/>
 			<implements name="org.eclipse.emf.ecore.EObject"/>
 			<implements name="org.eclipse.emf.common.notify.Notifier"/>
@@ -12,7 +12,8 @@
 				<discriminator column="dtype" strategy="value-map" value="Person"/>
 			</inheritance>
 			<version strategy="version-number" column="e_version"/>
-			<field name="id" persistence-modifier="persistent" primary-key="true"/>
+			<field name="id" persistence-modifier="persistent" null-value="none"/>
+			<field name="idESet" persistence-modifier="persistent"/>
 			<field name="name" persistence-modifier="persistent" null-value="exception"/>
 			<field name="address" persistence-modifier="persistent" null-value="none"/>
 			<field name="photo" persistence-modifier="persistent" embedded="true">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_ax_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_ax_o_package.jdo
index 559e8a0f4..2467e4955 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_ax_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_ax_o_package.jdo
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 15:59:49 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:22 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl">
-		<class name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="person" identity-type="application">
+		<class name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="person" identity-type="datastore">
 			<implements name="org.eclipse.emf.teneo.samples.emf.annotations.lob.Person"/>
 			<implements name="org.eclipse.emf.ecore.EObject"/>
 			<implements name="org.eclipse.emf.common.notify.Notifier"/>
@@ -12,7 +12,8 @@
 				<discriminator column="dtype" strategy="value-map" value="Person"/>
 			</inheritance>
 			<version strategy="version-number" column="e_version"/>
-			<field name="id" persistence-modifier="persistent" primary-key="true"/>
+			<field name="id" persistence-modifier="persistent" null-value="none"/>
+			<field name="idESet" persistence-modifier="persistent"/>
 			<field name="name" persistence-modifier="persistent" null-value="exception"/>
 			<field name="address" persistence-modifier="persistent" null-value="none"/>
 			<field name="photo" persistence-modifier="persistent" embedded="true">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_s_o_package.jdo
index 730b6ef6b..d3e2936b4 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_s_o_package.jdo
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:04 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:30 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl">
-		<class name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="person" identity-type="application">
+		<class name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="person" identity-type="datastore">
 			<implements name="org.eclipse.emf.teneo.samples.emf.annotations.lob.Person"/>
 			<implements name="org.eclipse.emf.ecore.EObject"/>
 			<implements name="org.eclipse.emf.common.notify.Notifier"/>
 			<inheritance strategy="new-table"/>
 			<version strategy="version-number" column="e_version"/>
-			<field name="id" persistence-modifier="persistent" primary-key="true"/>
+			<field name="id" persistence-modifier="persistent" null-value="none"/>
+			<field name="idESet" persistence-modifier="persistent"/>
 			<field name="name" persistence-modifier="persistent" null-value="exception"/>
 			<field name="address" persistence-modifier="persistent" null-value="none"/>
 			<field name="photo" persistence-modifier="persistent" embedded="true">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_sx_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_sx_o_package.jdo
index 3989342c3..621ff6db8 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_sx_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_sx_o_package.jdo
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 15:59:44 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:17 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl">
-		<class name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="person" identity-type="application">
+		<class name="org.eclipse.emf.teneo.samples.emf.annotations.lob.impl.PersonImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="person" identity-type="datastore">
 			<implements name="org.eclipse.emf.teneo.samples.emf.annotations.lob.Person"/>
 			<implements name="org.eclipse.emf.ecore.EObject"/>
 			<implements name="org.eclipse.emf.common.notify.Notifier"/>
 			<inheritance strategy="new-table"/>
 			<version strategy="version-number" column="e_version"/>
-			<field name="id" persistence-modifier="persistent" primary-key="true"/>
+			<field name="id" persistence-modifier="persistent" null-value="none"/>
+			<field name="idESet" persistence-modifier="persistent"/>
 			<field name="name" persistence-modifier="persistent" null-value="exception"/>
 			<field name="address" persistence-modifier="persistent" null-value="none"/>
 			<field name="photo" persistence-modifier="persistent" embedded="true">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_a_o_package.jdo
index ec90a305b..cf2f0009f 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_a_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:45 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:54 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl.CntrImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="cntr" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_s_o_package.jdo
index 64ac53536..335e8aac1 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_s_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:11 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:35 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.manytomany.impl.CntrImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="cntr" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_a_o_package.jdo
index 6e7c38049..6a9a5892d 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_a_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:32 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:46 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl.AddIDDocumentImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="addiddocument" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_s_o_package.jdo
index 94623df6b..c9aecf86c 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_s_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 15:59:55 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:28 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl.AddIDDocumentImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="addiddocument" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SecondaryTableActionJDO/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SecondaryTableActionJDO/mysql_a_o_package.jdo
index 5c2898b9c..0ced3d042 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SecondaryTableActionJDO/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SecondaryTableActionJDO/mysql_a_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:35 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:48 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.impl.PrinterImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="printer" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SecondaryTableActionJDO/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SecondaryTableActionJDO/mysql_s_o_package.jdo
index 65066939e..81ea0d674 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SecondaryTableActionJDO/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SecondaryTableActionJDO/mysql_s_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 15:59:59 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:29 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.secondarytable.impl.PrinterImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="printer" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_a_o_package.jdo
index d8a3ce33b..c7b9b3423 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_a_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:29 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:44 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="containeditem" identity-type="datastore">
@@ -54,7 +54,7 @@
 				<order column="ITEMLIST_ITEM_IDX"/>
 				<foreign-key delete-action="restrict" update-action="cascade"/>
 			</field>
-			<field name="joinedItem" persistence-modifier="persistent" table="itemlist_joineditem" delete-action="restrict">
+			<field name="joinedItem" persistence-modifier="persistent" table="itemlist_item" delete-action="restrict">
 				<collection element-type="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemImpl" dependent-element="false">
 					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
 				</collection>
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_s_o_package.jdo
index cc5fc1379..6c7436ad8 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_s_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 15:59:53 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:26 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="containeditem" identity-type="datastore">
@@ -48,7 +48,7 @@
 				<order column="ITEMLIST_ITEM_IDX"/>
 				<foreign-key delete-action="restrict" update-action="cascade"/>
 			</field>
-			<field name="joinedItem" persistence-modifier="persistent" table="itemlist_joineditem" delete-action="restrict">
+			<field name="joinedItem" persistence-modifier="persistent" table="itemlist_item" delete-action="restrict">
 				<collection element-type="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemImpl" dependent-element="false">
 					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
 				</collection>
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_a_o_package.jdo
index 84e6576bb..24f664c6a 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_a_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:52 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:53:00 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl.MyItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="myitem" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_s_o_package.jdo
index fee8e27db..d39d710aa 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_s_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:25 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:40 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.nmset.impl.MyItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="myitem" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_a_o_package.jdo
index a58f52d9a..897afb070 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_a_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:30 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:45 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="containeditem" identity-type="datastore">
@@ -54,7 +54,7 @@
 				<order column="ITEMLIST_ITEM_IDX"/>
 				<foreign-key delete-action="restrict" update-action="cascade"/>
 			</field>
-			<field name="joinedItem" persistence-modifier="persistent" table="itemlist_joineditem" delete-action="restrict">
+			<field name="joinedItem" persistence-modifier="persistent" table="itemlist_item" delete-action="restrict">
 				<collection element-type="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemImpl" dependent-element="false">
 					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
 				</collection>
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_s_o_package.jdo
index 11b6c91ff..e418c0cd2 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_s_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 15:59:54 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:27 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ContainedItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="containeditem" identity-type="datastore">
@@ -48,7 +48,7 @@
 				<order column="ITEMLIST_ITEM_IDX"/>
 				<foreign-key delete-action="restrict" update-action="cascade"/>
 			</field>
-			<field name="joinedItem" persistence-modifier="persistent" table="itemlist_joineditem" delete-action="restrict">
+			<field name="joinedItem" persistence-modifier="persistent" table="itemlist_item" delete-action="restrict">
 				<collection element-type="org.eclipse.emf.teneo.samples.emf.annotations.set.impl.ItemImpl" dependent-element="false">
 					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
 				</collection>
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_a_o_package.jdo
index 3cabd77c2..e8f0d7aea 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_a_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:42 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:52 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.AddressImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="address" identity-type="datastore">
@@ -56,8 +56,9 @@
 				<foreign-key delete-action="cascade" update-action="cascade"/>
 				<extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.HeadImpl"/>
 			</field>
-			<field name="leftArm" persistence-modifier="persistent" delete-action="restrict" null-value="none">
+			<field name="leftArm" persistence-modifier="persistent" delete-action="restrict" null-value="exception">
 				<foreign-key/>
+				<column name="arm_leftarm_e_id" allows-null="false"/>
 				<extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.ArmImpl"/>
 			</field>
 		</class>
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_ax_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_ax_o_package.jdo
index ccb6bc20b..ed22c1a20 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_ax_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_ax_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 15:59:51 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:23 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.AddressImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="address" identity-type="datastore">
@@ -56,8 +56,9 @@
 				<foreign-key delete-action="cascade" update-action="cascade"/>
 				<extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.HeadImpl"/>
 			</field>
-			<field name="leftArm" persistence-modifier="persistent" delete-action="restrict" null-value="none">
+			<field name="leftArm" persistence-modifier="persistent" delete-action="restrict" null-value="exception">
 				<foreign-key/>
+				<column name="arm_leftarm_e_id" allows-null="false"/>
 				<extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.ArmImpl"/>
 			</field>
 		</class>
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_s_o_package.jdo
index fa8de2c40..12030dc91 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_s_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:07 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:33 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.AddressImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="address" identity-type="datastore">
@@ -48,8 +48,9 @@
 				<foreign-key delete-action="cascade" update-action="cascade"/>
 				<extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.HeadImpl"/>
 			</field>
-			<field name="leftArm" persistence-modifier="persistent" delete-action="restrict" null-value="none">
+			<field name="leftArm" persistence-modifier="persistent" delete-action="restrict" null-value="exception">
 				<foreign-key/>
+				<column name="arm_leftarm_e_id" allows-null="false"/>
 				<extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.ArmImpl"/>
 			</field>
 		</class>
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_sx_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_sx_o_package.jdo
index 43679983f..01dedb502 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_sx_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_sx_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 15:59:46 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:19 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.AddressImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="address" identity-type="datastore">
@@ -48,8 +48,9 @@
 				<foreign-key delete-action="cascade" update-action="cascade"/>
 				<extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.HeadImpl"/>
 			</field>
-			<field name="leftArm" persistence-modifier="persistent" delete-action="restrict" null-value="none">
+			<field name="leftArm" persistence-modifier="persistent" delete-action="restrict" null-value="exception">
 				<foreign-key/>
+				<column name="arm_leftarm_e_id" allows-null="false"/>
 				<extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.ArmImpl"/>
 			</field>
 		</class>
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_a_o_package.jdo
index 991236211..6f91e9348 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_a_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:46 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:55 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.impl.ItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="MYITEMTABLE" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_s_o_package.jdo
index d456be925..8e87ccd88 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_s_o_package.jdo
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 
-<!--	Generated by Teneo on Wed Jul 11 16:00:13 CEST 2007 -->
+<!--	Generated by Teneo on Wed Jul 11 20:52:35 CEST 2007 -->
 <jdo>
 	<package name="org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.impl">
 		<class name="org.eclipse.emf.teneo.samples.emf.annotations.uniqueconstraints.impl.ItemImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="MYITEMTABLE" identity-type="datastore">
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/annotations/AllGenerateTests.java b/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/annotations/AllGenerateTests.java
index 1a7760978..ee5e20bc6 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/annotations/AllGenerateTests.java
+++ b/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/annotations/AllGenerateTests.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: AllGenerateTests.java,v 1.11 2007/07/09 12:54:45 mtaal Exp $
+ * $Id: AllGenerateTests.java,v 1.12 2007/07/11 19:00:23 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.jpox.test.emf.annotations;
@@ -45,7 +45,7 @@ import org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction;
  * All generate tests
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
  */
 public class AllGenerateTests {
 
@@ -53,6 +53,7 @@ public class AllGenerateTests {
 		TestSuite suite =
 				new MultiCfgTestSuite("Test for org.eclipse.emf.teneo.hibernate.test.emf.annotations", JPOXTestbed
 					.instance().getConfigurations());
+		suite.addTest(new JPOXGenerateTest(IdAction.class));
 
 		suite.addTest(new JPOXGenerateTest(SetAction.class));
 		suite.addTest(new JPOXGenerateTest(SetResourceAction.class));
@@ -71,7 +72,6 @@ public class AllGenerateTests {
 		suite.addTest(new JPOXGenerateTest(BasicAction.class));
 		suite.addTest(new JPOXGenerateTest(BookAction.class));
 		suite.addTest(new JPOXGenerateTest(InheritanceAnnotationAction.class));
-		suite.addTest(new JPOXGenerateTest(IdAction.class));
 		suite.addTest(new JPOXGenerateTest(DuplicatesAction.class));
 		suite.addTest(new JPOXGenerateTest(SetNMAction.class));